Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ introduction/welcome/changelog.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -4,6 +4,7 @@
 
 <para>Please note that the changelog only lists which editor was
-responsible for putting the changes into CVS; please read the Credits
-page in Chapter 1 for details on who wrote what.</para>
+responsible for putting the changes into <acronym>CVS</acronym>; please read 
+the <xref linkend="intro-welcome-credits"/> page in Chapter 1 for details on 
+who wrote what.</para>
 
 <para>&version; - &releasedate;</para>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ introduction/welcome/credits.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -1,3 +1,3 @@
-<sect1 id="intro-welcome-credits">
+<sect1 id="intro-welcome-credits" xreflabel="Credits">
 <?dbhtml filename="credits.html" dir="introduction"?>
 <title>Credits</title>
@@ -30,13 +30,13 @@
 <itemizedlist>
 
-<listitem><para>Chapter 01.  Based on the LFS introductory text by <emphasis>
-Gerard Beekmans</emphasis>, modified by <emphasis>Mark Hymers</emphasis>
-for <acronym>BLFS</acronym>.</para></listitem>
+<listitem><para>Chapter 01.  Based on the <acronym>LFS</acronym> introductory 
+text by <emphasis> Gerard Beekmans</emphasis>, modified by <emphasis>
+Mark Hymers</emphasis> for <acronym>BLFS</acronym>.</para></listitem>
 
 <listitem><para>Chapter 02: The /usr versus /usr/local debate: <emphasis>Andrew 
 McMurry</emphasis>.</para></listitem>
 
-<listitem><para>Chapter 02: Going beyond BLFS: <emphasis>Tushar Teredesai
-</emphasis>.</para></listitem>
+<listitem><para>Chapter 02: Going beyond <acronym>BLFS</acronym>: <emphasis>
+Tushar Teredesai</emphasis>.</para></listitem>
 
 <listitem><para>Chapter 03: /etc/inputrc: <emphasis>Chris Lynn</emphasis>.
@@ -59,6 +59,6 @@
 Peres</emphasis>.</para></listitem>
 
-<listitem><para>Chapter 04: <!--<xref linkend="ch06-firewall"/>-->Firewalling: 
-<emphasis>Henning Rohde with thanks to Jeff Bauman</emphasis>.</para></listitem>
+<listitem><para>Chapter 04: Firewalling: <emphasis>Henning Rohde with thanks to 
+Jeff Bauman</emphasis>.</para></listitem>
 
 <listitem><para>Chapter 11: Which <emphasis>Mark Hymers</emphasis> with
@@ -191,5 +191,5 @@
 <listitem><para><emphasis>Scot Mc Pherson</emphasis> for writing the
 gnome-1.4.txt hint from which was gathered useful information and for
-warning us that Gnome Version 2.0 may not be ready to put in the book.</para>
+warning us that GNOME Version 2.0 may not be ready to put in the book.</para>
 </listitem>
 
@@ -202,6 +202,6 @@
 
 <listitem><para><emphasis>DJ Lucas</emphasis> for contributing to dhcpcd
-patch and many contributions while dhcp section was being developed.</para>
-</listitem>
+patch and many contributions while <acronym>DHCP</acronym> section was being 
+developed.</para></listitem>
 
 <listitem><para><emphasis>Billy O'Connor</emphasis> for building GNOME
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/bootdisk.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -66,8 +66,8 @@
 <para>You should make a custom kernel that includes only those features
 needed to rescue your system, so it will have the least size.  No
-sense in building in support for things like <command>xfree86</command>,
-<command>dri</command>, etc, as most rescues are performed from the
-command prompt.  Along the same lines, if you have GCC-2.95.*, it is
-known to produce smaller kernels.  So you might want to use that
+sense in building in support for things like <application>xfree86</application>,
+<application>dri</application>, etc, as most rescues are performed from the
+command prompt.  Along the same lines, if you have <xref linkend="gcc2"/>, it 
+is known to produce smaller kernels.  So you might want to use that
 compiler for this kernel.  If you do so, don't overlook any loadable
 modules (which are not addressed here) you might need - they need to be
@@ -84,11 +84,10 @@
 components shown in this document, you will need a kernel that is 643 or
 fewer blocks in size.  If you want the optional programs - a very basic
-editor, like ed, and rudimentary disk partitioning, like sfdisk - the
-kernel will need to be 595 or fewer blocks in size.  This should not be
-a major problem unless your needs are fairly esoteric.  On the system
-used to develop this version of the procedures, using only ext2 file
-systems and not using networking or CDs for recovery, the kernel image
-is only 481 blocks.  And there may be more to gain - it has not been
-closely examined for additional gains.</para>
+editor, like <command>ed</command>, and rudimentary disk partitioning, like 
+<command>sfdisk</command> - the kernel will need to be 595 or fewer blocks in 
+size.  This should not be a major problem unless your needs are fairly 
+esoteric.  On the system used to develop this version of the procedures, using 
+only ext2 file systems and not using networking or <acronym>CD</acronym>s for 
+recovery, the kernel image is only 481 blocks.  And there may be more to gain - it has not been closely examined for additional gains.</para>
 
 <para>This kernel image will be called "rescueimage" hereinafter. You
@@ -134,6 +133,6 @@
 system</emphasis></para>
 
-<screen><userinput><command>mkdir -p /mnt/loop1</command>
-<command>dd if=/dev/zero of=/tmp/rfloppy bs=1k count=4096</command></userinput></screen>
+<screen><userinput><command>mkdir -p /mnt/loop1
+dd if=/dev/zero of=/tmp/rfloppy bs=1k count=4096</command></userinput></screen>
 
 <para><emphasis>Command explanations</emphasis></para>
@@ -163,7 +162,7 @@
 that you can use if you don't have either of these situations.</para>
 
-<screen><userinput><command>losetup /dev/loop1 /tmp/rfloppy</command>
-<command>mke2fs -m 0 -N 504 /dev/loop1</command>
-<command>mount -t ext2 /dev/loop1 /mnt/loop1</command></userinput></screen>
+<screen><userinput><command>losetup /dev/loop1 /tmp/rfloppy
+mke2fs -m 0 -N 504 /dev/loop1
+mount -t ext2 /dev/loop1 /mnt/loop1</command></userinput></screen>
 
 <para><emphasis>Command explanations</emphasis></para>
@@ -190,6 +189,6 @@
 by these next two commands.</para>
 
-<screen><userinput><command>mke2fs -F -m 0 -N 504 /tmp/rfloppy</command>
-<command>mount -o loop /tmp/rfloppy /mnt/loop1</command></userinput></screen>
+<screen><userinput><command>mke2fs -F -m 0 -N 504 /tmp/rfloppy
+mount -o loop /tmp/rfloppy /mnt/loop1</command></userinput></screen>
 
 <para><emphasis>Command explanations</emphasis></para>
@@ -220,6 +219,6 @@
 <para>First, to have as much free space as possible, remove the
 <filename>lost+found</filename> directory, which is not needed because
-it is only used by fsck.  Since fsck will never be run on this file
-system, it is unneeded.
+it is only used by <command>fsck</command>.  Since <command>fsck</command> 
+will never be run on this file system, it is unneeded.
 
 <screen><userinput><command>rmdir /mnt/loop1/lost+found/</command></userinput></screen></para>
@@ -323,6 +322,6 @@
 /sbin/devfsd /dev</userinput></screen>
 
-<para>If you don't use devfsd, but created a static /dev/directory
-using <command>MAKEDEV</command>, or any similar process, the
+<para>If you don't use devfsd, but created a static <filename>/dev</filename> 
+directory using <command>MAKEDEV</command>, or any similar process, the
 <filename>rcS</filename> script will do slightly different things.
 Also, don't forget that it is creating the
@@ -442,5 +441,6 @@
 it is not what is considered to be "user friendly".  But the
 <command>fdisk</command> and <command>cfdisk</command> programs are
-substantially larger or require more shared objects, like ncurses.</para>
+substantially larger or require more shared objects, like <application>ncurses
+</application>.</para>
 
 <para>The second utility is an editor.  Most graphical editors are
@@ -473,6 +473,5 @@
 strip -p --strip-unneeded --remove-section=.comment \
     -o /mnt/loop1/bin/ed /bin/ed
-chmod 555 /mnt/loop1/sbin/sfdisk /mnt/loop1/bin/ed
-</command></userinput></screen>
+chmod 555 /mnt/loop1/sbin/sfdisk /mnt/loop1/bin/ed</command></userinput></screen>
 
 <para>Also, keeping in mind your space limitations, copy any other
@@ -500,6 +499,5 @@
 strip -p --strip-unneeded --remove-section=.comment \
 &nbsp;&nbsp;&nbsp;&nbsp;-o /mnt/loop1/lib/libdl.so.2 /lib/libdl-2.3.2.so &amp;&amp;
-chmod 555 /mnt/loop1/lib/{libc.so.6,ld-linux.so.2,libdl.so.2}
-</command></userinput></screen>  
+chmod 555 /mnt/loop1/lib/{libc.so.6,ld-linux.so.2,libdl.so.2}</command></userinput></screen>  
 
 <para>Note that the above commands change the names of the libraries,
@@ -511,5 +509,5 @@
 
 <para>Unmount the loopback file.  If you used <command>mount</command>'s
-<command>-o loop</command> option, the "bond" between the loop device
+<userinput>-o loop</userinput> option, the "bond" between the loop device
 and the file will be removed when the unmount is done.  Just omit the
 <command>losetup -d /dev/loop1</command> from the following
@@ -521,6 +519,5 @@
 losetup -d /dev/loop1 &amp;&amp;  # Omit if mount's -o loop was used
 gzip -9 &lt; /tmp/rfloppy &gt; /tmp/rootfs.gz
-ls -l /tmp/rootfs.gz
-</command></userinput></screen>  
+ls -l /tmp/rootfs.gz</command></userinput></screen>  
 
 <para><emphasis>Join a kernel image and initrd onto a diskette</emphasis></para>
@@ -539,6 +536,6 @@
 <filename>/dev/fd0</filename> instead of the /dev/floppy/0.</para>
 
-<screen><userinput><command>dd if=rescueimage of=/dev/floppy/0 bs=1k</command>
-<command>rdev /dev/floppy/0 0,0
+<screen><userinput><command>dd if=rescueimage of=/dev/floppy/0 bs=1k
+rdev /dev/floppy/0 0,0
 rdev -R /dev/floppy/0 0</command></userinput></screen>
 
@@ -548,5 +545,5 @@
 the kernel will use when it boots. Because it loads an initrd, it will
 automatically set that as the root device, initially. So, the
-<command>0,0</command> gives it "no value", telling the kernel to not
+<userinput>0,0</userinput> gives it "no value", telling the kernel to not
 mount any other device. Some folks give <filename>/dev/fd0</filename> or
 something similar. But this has effect <emphasis>only</emphasis> when
Index: postlfs/config/compressdoc.xml
===================================================================
--- postlfs/config/compressdoc.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/compressdoc.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -3,10 +3,10 @@
 <title>Compressing man and info pages</title>
 
-<para>Man and info reader programs can transparently process gzipped or
-bziptwoed pages, a feature you can use to free some disk space while keeping
+<para>Man and info reader programs can transparently process gzip'ed or
+bzip2'ed pages, a feature you can use to free some disk space while keeping
 your documentation available. However, things are not that simple: man
 directories tend to contain links - hard and symbolic - which defeat simple
-ideas like recursively calling gzip on them. A better way to go is to use the
-script below.
+ideas like recursively calling <command>gzip</command> on them. A better way 
+to go is to use the script below.
 </para>
 
@@ -140,5 +140,5 @@
 
 <para>Now, as root, you can issue a
-<userinput><command>/usr/bin/compressdoc /usr/man bz2</command></userinput>
+<command>/usr/bin/compressdoc /usr/man bz2</command>
 to compress your system man pages. Similarly, you can run it on the
 <filename class="directory">/usr/info</filename> directory. Don't forget
Index: postlfs/config/inputrc.xml
===================================================================
--- postlfs/config/inputrc.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/inputrc.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -1,3 +1,3 @@
-<sect1 id="postlfs-config-inputrc">
+<sect1 id="postlfs-config-inputrc" xreflabel="/etc/inputrc">
 <?dbhtml filename="inputrc.html" dir="postlfs"?>
 <title>/etc/inputrc</title>
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/profile.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -1,3 +1,3 @@
-<sect1 id="postlfs-config-profile">
+<sect1 id="postlfs-config-profile" xreflabel="The Bash Shell Startup Files">
 <?dbhtml filename="profile.html" dir="postlfs"?>
 <title>The Bash Shell Startup Files</title>
Index: postlfs/config/skel.xml
===================================================================
--- postlfs/config/skel.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/skel.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -5,30 +5,25 @@
 <para>Together, the <command>/usr/sbin/useradd</command> command and
 <filename>/etc/skel</filename> directory (both are easy to setup and use)
-provide a way to assure new users are added on your
-<acronym>LFS</acronym> system with the
-same beginning settings for things like <envar>PATH</envar>, keyboard processing and
-environmental variables.  Using these two facilities makes it easier to
-assure this initial state for each new user.
-</para>
+provide a way to assure new users are added on your <acronym>LFS</acronym> 
+system with the same beginning settings for things like <envar>PATH</envar>, 
+keyboard processing and environmental variables.  Using these two facilities 
+makes it easier to assure this initial state for each new user.</para>
 
-<para>
-The <filename>/etc/skel</filename> directory holds copies of various
+<para>The <filename>/etc/skel</filename> directory holds copies of various
 initialization and other files that may be copied to the new user's home
-directory when the <command>/usr/sbin/useradd</command>
-program adds the new user.</para>
+directory when the <command>/usr/sbin/useradd</command> program adds the new 
+user.</para>
 
-<para>Useradd</para>
+<para><emphasis>Useradd<</emphasis></para>
 
 <para>The <command>useradd</command> program uses a collection of
 default values kept in <filename>/etc/default/useradd</filename>,
 if it exists.  If the file does not exist, then it uses some internal
-defaults.  You can see the default values by running
-<userinput><command>/usr/sbin/useradd -D</command></userinput>.
-</para>
+defaults.  You can see the default values by running <command>/usr/sbin/useradd 
+-D</command>.</para>
 
-<para>To change these values to something new, create a base
-<filename>/etc/default/useradd</filename> file with the same values as
-the output of <userinput><command>/usr/sbin/useradd -D</command></userinput>.  Here is a
-sample.</para>
+<para>To change these values to something new, create a base <filename>
+/etc/default/useradd</filename> file with the same values as the output of 
+<command>/usr/sbin/useradd -D</command>.  Here is a sample.</para>
 
 <screen># Begin /etc/default/useradd
@@ -48,14 +43,13 @@
 <screen><userinput><command>/usr/sbin/useradd -D -s/bin/bash</command></userinput></screen>
 
-<para>This will set the <envar>SHELL</envar>= line to
+<para>This will set the <envar>SHELL</envar>= line to 
 <envar>SHELL</envar>=/bin/bash.</para>
 
 <para><command>Useradd</command> has many parameters that
-can be set in the <filename>/etc/default/useradd</filename> file.
-</para>
+can be set in the <filename>/etc/default/useradd</filename> file.</para>
 
 <para>For more information see <command>man useradd</command>.</para>
 
-<para>/etc/skel</para>
+<para><emphasis><filename>/etc/skel</filename></emphasis></para>
 
 <para>To get started create an <filename>/etc/skel</filename> directory
@@ -70,12 +64,11 @@
 
 <para>You can also put other files in <filename>/etc/skel</filename> and
-different permissions may be needed for them.
-</para>
+different permissions may be needed for them.</para>
 
-<para>
-Decide which initialization files should be provided in every (or most)
+<para>Decide which initialization files should be provided in every (or most)
 new user's home directory. The decisions you make will affect what you
-do in the next three sections, "/etc/inputrc", "The Bash Shell Startup
-Files" and "/etc/vimrc, ~/.vimrc". Some or all of those files will be
+do in the next three sections, <xref linkend="postlfs-config-inputrc"/>, 
+<xref linkend="postlfs-config-profile"/> and 
+<xref linkend="postlfs-config-vimrc"/>. Some or all of those files will be
 useful for root, any already-existing users, and new users.</para>
 
@@ -100,9 +93,9 @@
 of any other user already in the system.</para>
 
-<para>When Adding a User</para>
+<para><emphasis>When Adding a User</emphasis></para>
 
-<para>When adding a new user with <filename>useradd</filename> use
+<para>When adding a new user with <command>useradd</command> use
 the <userinput>-m</userinput> parameter, which tells
-<filename>useradd</filename> to create the user's home directory and
+<command>useradd</command> to create the user's home directory and
 copy files from <filename>/etc/skel</filename> (can be overridden) to
 the new user's home directory.  For example:</para>
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ postlfs/config/vimrc.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -1,22 +1,28 @@
-<sect1 id="postlfs-config-vimrc">
+<sect1 id="postlfs-config-vimrc" xreflabel="/etc/vimrc, ~/.vimrc">
 <?dbhtml filename="vimrc.html" dir="postlfs"?>
 <title>/etc/vimrc, ~/.vimrc</title>
 
-<para>The LFS book installs vim as its editor.  At this point we should
+<para>The <acronym>LFS</acronym> book installs
+<application>vim</application> as its editor.  At this point we should
 state that there are a <emphasis>lot</emphasis> of different editors out
-there including emacs, nano, joe and many more.  Anyone who has been
-around the Internet (especially usenet) for a short time will certainly
-have observed at least one flame war, usually involving vim and emacs
-users!</para>
+there including <application>emacs</application>,
+<application>nano</application>, <application>joe</application> and many 
+more.  Anyone who has been around the Internet (especially usenet) for a 
+short time will certainly have observed at least one flame war, usually 
+involving <application>vim</application> and
+<application>emacs</application> users!</para>
 
-<para>The LFS book gives a basic <filename>vimrc</filename> file.  Here,
-we attempt to enhance this file.  At startup, vim reads
-<filename>/etc/vimrc</filename> and <filename>~/.vimrc</filename>
-(i.e., the global vimrc and the user-specific one.).  Note that this is
-only true if you compiled vim using LFS-3.1 onwards.  Prior to this,
-the global vimrc was <filename>/usr/share/vim/vimrc</filename>.</para>
+<para>The <acronym>LFS</acronym> book gives a basic <filename>vimrc
+</filename> file.  Here, we attempt to enhance this file.  At startup,
+<command>vim</command> reads <filename>/etc/vimrc</filename> and 
+<filename>~/.vimrc</filename> (i.e., the global
+<filename>vimrc</filename> and the user-specific one.).  Note that this is
+only true if you compiled <application>vim</application> using
+<acronym>LFS</acronym>-3.1 onwards.  Prior to this,
+the global <filename>vimrc</filename> was <filename>/usr/share/vim/vimrc
+</filename>.</para>
 
-<para>Here is a slightly expanded vimrc that you can put in
-<filename>/etc/vimrc</filename> to provide global effect. Of course, if
+<para>Here is a slightly expanded <filename>vimrc</filename> that you can 
+put in <filename>/etc/vimrc</filename> to provide global effect. Of course, if
 you put it into <filename>/etc/skel/.vimrc</filename> instead, it will
 be made available to users you add to the system later. You can also copy
@@ -41,48 +47,58 @@
 " End .vimrc</screen></para>
 
-<para>A FAQ on the lfs lists regards the comment tags in vimrc.  Note
-that they are " instead of the more usual # or //.  This is correct, the
-syntax for vimrc is slightly unusual.</para>
+<para>A <acronym>FAQ</acronym> on the lfs mailing lists regards the 
+comment tags in <filename>vimrc</filename>.  Note that they are " instead 
+of the more usual # or //.  This is correct, the syntax for <filename>vimrc
+</filename> is slightly unusual.</para>
 
 <para>We'll run through a quick explanation of what each of the
 options in this example file means here:</para>
 <itemizedlist>
-<listitem><para><userinput>set nocompatible</userinput> : This option stops vim from behaving in a strongly vi-compatible way.  It
-should be at the start of any vimrc file as it can affect lots of other
-options which you may want to override.</para></listitem>
+<listitem><para><userinput>set nocompatible</userinput> : This option
+stops <command>vim</command> from behaving in a strongly <command>vi
+</command>-compatible way.  It should be at the start of any <filename>vimrc
+</filename> file as it can affect lots of other options which you may want to 
+override.</para></listitem>
 
-<listitem><para><userinput>set bs=2</userinput> : This influences the behavior of the backspace option.  It is fairly
-complex so see <userinput>:help 'bs'</userinput> for more 
-details.</para></listitem>
+<listitem><para><userinput>set bs=2</userinput> : This influences the behavior 
+of the backspace option.  It is fairly complex so see <userinput>:help 'bs'
+</userinput> for more details.</para></listitem>
 
-<listitem><para><userinput>set columns=80</userinput> : This simply sets the number of columns used on the 
-screen.</para></listitem>
+<listitem><para><userinput>set columns=80</userinput> : This simply sets the 
+number of columns used on the screen.</para></listitem>
 
-<listitem><para><userinput>set background=dark</userinput> : This tells vim to use colors which look good on a dark 
+<listitem><para><userinput>set background=dark</userinput> : This tells
+<command>vim</command> to use colors which look good on a dark 
 background.</para></listitem>
 
-<listitem><para><userinput>set tabstop=8</userinput> : The number of spaces which a tabstop takes.</para></listitem>
+<listitem><para><userinput>set tabstop=8</userinput> : The number of spaces 
+which a tabstop takes.</para></listitem>
 
-<listitem><para><userinput>set wrapmargin=8</userinput> : This is the number of characters from the right window 
-border where wrapping starts.</para></listitem>
+<listitem><para><userinput>set wrapmargin=8</userinput> : This is the number of 
+characters from the right window  border where wrapping starts.</para>
+</listitem>
 
-<listitem><para><userinput>set nobk</userinput> : This stops vim from creating a backup before 
-overwriting a file.</para></listitem>
+<listitem><para><userinput>set nobk</userinput> : This stops <command>vim
+</command> from creating a backup before overwriting a file.</para></listitem>
 
-<listitem><para><userinput>syntax on</userinput> : Enables vim's syntax highlighting.</para></listitem>
+<listitem><para><userinput>syntax on</userinput> : Enables
+<command>vim</command>'s syntax highlighting.</para></listitem>
 
-<listitem><para><userinput>set ruler</userinput> : This makes vim show the current row and column at the bottom right of
+<listitem><para><userinput>set ruler</userinput> : This makes <command>vim
+</command> show the current row and column at the bottom right of
 the screen.</para></listitem>
 
-<listitem><para><userinput>set noexpandtab</userinput> : This makes vim insert tabs as tab characters instead of as a set of
+<listitem><para><userinput>set noexpandtab</userinput> : This makes
+<command>vim</command> insert tabs as tab characters instead of as a set of
 spaces.</para></listitem>
 
 </itemizedlist>
 
-<para>More information on the <emphasis>many</emphasis> vim options 
-can be found by reading the help inside vim itself.  Do this by typing
-<userinput>:help</userinput> in vim to get the general help, or by
-typing <userinput>:help usr_toc.txt</userinput> to view the User Manual
-Table of Contents.</para>
+<para>More information on the <emphasis>many</emphasis> <command>vim</command> 
+options can be found by reading the help inside <command>vim</command> itself.  
+Do this by typing <command>:</command><userinput>help</userinput> in 
+<command>vim</command> to get the general help, or by typing <command>:
+</command><userinput>help usr_toc.txt</userinput> to view 
+the User Manual Table of Contents.</para>
 
 </sect1>
Index: preface/organization.xml
===================================================================
--- preface/organization.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ preface/organization.xml	(revision 78b3cd61eb5836b5c75f20dcb5efd2804a5a6994)
@@ -32,5 +32,6 @@
 <sect2><title>Part VI - Server Networking</title>
 <para>Here we deal with setting up mail and other servers (such as
-<application>SSH</application>, <application>CVS</application>, etc.).</para></sect2>
+<application><acronym>SSH</acronym></application>, <application><acronym>CVS
+</acronym></application>, etc.).</para></sect2>
 
 <sect2><title>Part VII - Content Serving</title>
@@ -59,10 +60,10 @@
 <sect2><title>Part XII - Multimedia</title>
 <para>Here we cover setting multimedia libraries and drivers along with some
-audio, video and CD-writing programs.</para></sect2>
+audio, video and <acronym>CD</acronym>-writing programs.</para></sect2>
 
 <sect2><title>Part XIII - Printing, Scanning and Typesetting</title>
 <para>The <acronym>PST</acronym> part of the book covers things from
-<application>ghostscript</application>, <application>CUPS</application>
-and <application>DocBook</application> 
+<application>ghostscript</application>, <application><acronym>CUPS</acronym>
+</application> and <application>DocBook</application> 
 to installing <application>TeX</application>.</para></sect2>
 
