--- manuals/trunk/maint-guide/maint-guide.en.dbk	2011/05/03 04:49:01	8787
+++ manuals/trunk/maint-guide/maint-guide.en.dbk	2011/05/03 13:25:47	8791
@@ -869,8 +869,8 @@
 </listitem>
 <listitem><para>Intermediate complexity packages</para>
 <itemizedlist>
-  <listitem><para>single binary package, arch = any (executables written in compiled languages such as C and C++)</para></listitem>
-  <listitem><para>multiple binary packages, arch = any + all (packages for executables + documentation)</para></listitem>
+  <listitem><para>single binary package, arch = any (<ulink url="&elf;">ELF</ulink> binary executables compiled from compiler languages such as C and C++)</para></listitem>
+  <listitem><para>multiple binary packages, arch = any + all (packages for <ulink url="&elf;">ELF</ulink> binary executables + documentation)</para></listitem>
   <listitem><para>upstream source in a format other than <filename>tar.gz</filename> or <filename>tar.bz2</filename></para></listitem>
   <listitem><para>upstream source containing undistributable contents</para></listitem>
 </itemizedlist>
@@ -878,8 +878,8 @@
 <listitem><para>High complexity packages</para>
 <itemizedlist>
   <listitem><para>interpreter module package used by other packages</para></listitem>
-  <listitem><para>generic library package used by other packages</para></listitem>
-  <listitem><para>multiple binary packages including a library package</para></listitem>
+  <listitem><para>generic <ulink url="&elf;">ELF</ulink> library package used by other packages</para></listitem>
+  <listitem><para>multiple binary packages including an <ulink url="&elf;">ELF</ulink> library package</para></listitem>
   <listitem><para>source package with multiple upstream sources</para></listitem>
   <listitem><para>kernel module packages</para></listitem>
   <listitem><para>kernel patch packages</para></listitem>
@@ -1067,8 +1067,8 @@
 <para>
 The second step of the Autotools workflow is usually that the user obtains this
 distributed source and runs <literal>./configure &amp;&amp; make</literal> in
-the source directory to compile the program into a
-<command><replaceable>binary</replaceable></command> executable.
+the source directory to compile the program into an executable command
+<command><replaceable>binary</replaceable></command>.
 </para>
 <screen>
 Makefile.in -----+                +-&gt; Makefile -----+-&gt; make -&gt; <replaceable>binary</replaceable>
@@ -1518,10 +1518,10 @@
 <literal>$(DESTDIR)</literal> to the temporary directory. 
 </para>
 <para>
-For packages of the single binary type, the temporary directory used
+For a source package generating a single binary package, the temporary directory used
 by the <command>dh_auto_install</command> command will be set to
 <filename>debian/<replaceable>package</replaceable></filename>.
-<footnote><para> For packages of the multiple binary type, the
+<footnote><para> For a source package generating multiple binary packages, the
 <command>dh_auto_install</command> command uses <filename>debian/tmp</filename>
 as the temporary directory while the <command>dh_install</command> command with
 the help of
@@ -1560,7 +1560,7 @@
 options including <literal>--prefix=/usr</literal>.  </para> </footnote>:
 </para>
 <screen>
-# Where to put binary executables on 'make install'?
+# Where to put executable commands on 'make install'?
 BIN     = /usr/local/bin
 # Where to put icons on 'make install'?
 ICONS   = /usr/local/share/gentoo
@@ -1571,7 +1571,7 @@
 Debian, so change those paths to:
 </para>
 <screen>
-# Where to put binary executables on 'make install'?
+# Where to put executable commands on 'make install'?
 BIN     = $(DESTDIR)/usr/bin
 # Where to put icons on 'make install'?
 ICONS   = $(DESTDIR)/usr/share/gentoo
@@ -1583,7 +1583,7 @@
 your package.
 </para>
 <para>
-So, we should install binary executables in <filename>/usr/bin</filename> instead of
+So, we should install executable commands in <filename>/usr/bin</filename> instead of
 <filename>/usr/local/bin</filename>, the manual page in
 <filename>/usr/share/man/man1</filename> instead of
 <filename>/usr/local/man/man1</filename>, and so on.  Notice how there's no manual
@@ -1629,7 +1629,7 @@
 </para>
 <para>
 Originally, <systemitem role="package">gentoo</systemitem>'s
-install target said:
+<literal>install</literal> target said:
 </para>
 <screen>
 install: gentoo-target
@@ -2141,7 +2141,7 @@
 <para>
 <citerefentry> <refentrytitle>dh_shlibdeps</refentrytitle>
 <manvolnum>1</manvolnum> </citerefentry> calculates shared library dependencies
-for binary packages.  It generates a list of ELF executables and shared
+for binary packages.  It generates a list of <ulink url="&elf;">ELF</ulink> executables and shared
 libraries it has found for each binary package.  This list is used for
 substituting <literal>${shlibs:Depends}</literal>.
 </para>
@@ -2407,7 +2407,7 @@
 example, <literal>debian/rules <replaceable>build</replaceable></literal> and
 <literal>fakeroot make -f debian/rules <replaceable>binary</replaceable></literal>
 execute rules for <literal><replaceable>build</replaceable></literal> and
-<literal><replaceable>binary</replaceable></literal> targets trespectively.
+<literal><replaceable>binary</replaceable></literal> targets respectively.
 </para>
 <para>
 Here is a simplified explanation of the targets:
@@ -3426,7 +3426,7 @@
 src/<replaceable>bar</replaceable> usr/bin
 </screen>
 <para>
-This means when this package is installed, there will be a binary executable
+This means when this package is installed, there will be an executable command
 <filename>/usr/bin/<replaceable>bar</replaceable></filename>.
 </para>
 <para>