Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/bluefish.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -114,5 +114,7 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
     <para>
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/ed.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -30,10 +30,12 @@
     <title>Introduction to Ed</title>
 
-    <para><application>Ed</application> is a line-oriented text editor. It
-    is used to create, display, modify and otherwise manipulate text files,
-    both interactively and via shell scripts. Ed isn't something which many
-    people use. It's described here because it can be used by the patch
-    program if you encounter an ed-based patch file. This happens rarely
-    because diff-based patches are preferred these days.</para>
+    <para>
+      <application>Ed</application> is a line-oriented text editor. It
+      is used to create, display, modify and otherwise manipulate text files,
+      both interactively and via shell scripts. Ed isn't something which many
+      people use. It's described here because it can be used by the patch
+      program if you encounter an ed-based patch file. This happens rarely
+      because diff-based patches are preferred these days.
+    </para>
 
     &lfs91_checked;
@@ -42,20 +44,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&ed-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&ed-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&ed-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&ed-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &ed-md5sum;</para>
+        <para>
+          Download MD5 sum: &ed-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &ed-size;</para>
+        <para>
+          Download size: &ed-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &ed-buildsize;</para>
+        <para>
+          Estimated disk space required: &ed-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &ed-time;</para>
+        <para>
+          Estimated build time: &ed-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -76,13 +90,19 @@
     <title>Installation of Ed</title>
 
-    <para>Install <application>Ed</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Ed</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -113,5 +133,7 @@
         <term><command>ed</command></term>
         <listitem>
-          <para>is a line-oriented text editor.</para>
+          <para>
+            is a line-oriented text editor.
+          </para>
           <indexterm zone="ed ed-prog">
             <primary sortas="b-ed">ed</primary>
@@ -123,7 +145,8 @@
         <term><command>red</command></term>
         <listitem>
-          <para>is a restricted <command>ed</command>&mdash;it can only edit
-          files in the current directory and cannot execute shell
-          commands.</para>
+          <para>
+            is a restricted <command>ed</command>&mdash;it can only edit
+            files in the current directory and cannot execute shell commands.
+          </para>
           <indexterm zone="ed red">
             <primary sortas="b-red">red</primary>
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/editors.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -16,8 +16,10 @@
   <title>Editors</title>
 
-  <para>This chapter is referenced in the LFS book for those wishing to
-  use other editors on their LFS system. You're also shown how some LFS
-  installed programs benefit from being recompiled after GUI libraries
-  have been installed.</para>
+  <para>
+    This chapter is referenced in the LFS book for those wishing to
+    use other editors on their LFS system. You're also shown how some LFS
+    installed programs benefit from being recompiled after GUI libraries
+    have been installed.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluefish.xml"/>
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/emacs.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -31,6 +31,8 @@
     <title>Introduction to Emacs</title>
 
-    <para>The <application>Emacs</application> package contains an extensible,
-    customizable, self-documenting real-time display editor.</para>
+    <para>
+      The <application>Emacs</application> package contains an extensible,
+      customizable, self-documenting real-time display editor.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&emacs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&emacs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &emacs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &emacs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &emacs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &emacs-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&emacs-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&emacs-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &emacs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &emacs-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &emacs-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &emacs-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -101,6 +115,8 @@
     <title>Installation of Emacs</title>
 
-    <para>Install <application>Emacs</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Emacs</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --localstatedir=/var &amp;&amp;
@@ -116,5 +132,7 @@
     </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root" revision="systemd"><userinput>make install &amp;&amp;
@@ -133,25 +151,35 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--localstatedir=/var</parameter>: Create game score files
-    in <filename class='directory'>/var/games/emacs</filename> instead
-    of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
-
-    <para><option>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 
-    IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI
-    -lMagickWand-6.Q16HDRI" </option>:
-    use these when you invoke configure if you have installed <xref
-    linkend="imagemagick6"/> and wish to link to them (the normal unversioned
-    pkgconfig files collide with <xref linkend="imagemagick"/> which this
-    package cannot use).</para>
-
-    <para><option>--with-gif=no</option>: Use this if you have not installed
-    <xref linkend="giflib"/> or 
-    <ulink url="http://directory.fsf.org/wiki/Libungif">libungif</ulink>.</para>
-
-    <para><option>--with-tiff=no</option>: Use this if you have not installed
-    <xref linkend="libtiff"/>.</para>
-
-    <para><option>--with-gnutls=no</option>: Use this if you have not installed
-    <xref linkend="gnutls"/>.</para>
+    <para>
+      <parameter>--localstatedir=/var</parameter>: Create game score files
+      in <filename class='directory'>/var/games/emacs</filename> instead
+      of <filename class='directory'>/usr/var/games/emacs</filename>.
+    </para>
+
+    <para>
+      <option>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 
+      IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI
+      -lMagickWand-6.Q16HDRI" </option>:
+      use these when you invoke configure if you have installed <xref
+      linkend="imagemagick6"/> and wish to link to them (the normal unversioned
+      pkgconfig files collide with <xref linkend="imagemagick"/> which this
+      package cannot use).
+    </para>
+
+    <para>
+      <option>--with-gif=no</option>: Use this if you have not installed
+      <xref linkend="giflib"/> or 
+      <ulink url="http://directory.fsf.org/wiki/Libungif">libungif</ulink>.
+    </para>
+
+    <para>
+      <option>--with-tiff=no</option>: Use this if you have not installed
+      <xref linkend="libtiff"/>.
+    </para>
+
+    <para>
+      <option>--with-gnutls=no</option>: Use this if you have not installed
+      <xref linkend="gnutls"/>.
+    </para>
 
   </sect2>
@@ -188,6 +216,8 @@
         <term><command>ctags</command></term>
         <listitem>
-          <para>creates cross-reference tagfile database files
-          for source code.</para>
+          <para>
+            creates cross-reference tagfile database files
+            for source code.
+          </para>
           <indexterm zone="emacs ctags">
             <primary sortas="b-ctags">ctags</primary>
@@ -199,6 +229,8 @@
         <term><command>ebrowse</command></term>
         <listitem>
-          <para>permits browsing of C++ class hierarchies from
-          within <command>emacs</command>.</para>
+          <para>
+            permits browsing of C++ class hierarchies from
+            within <command>emacs</command>.
+          </para>
           <indexterm zone="emacs ebrowse">
             <primary sortas="b-ebrowse">ebrowse</primary>
@@ -210,5 +242,7 @@
         <term><command>emacs</command></term>
         <listitem>
-          <para>is an editor.</para>
+          <para>
+            is an editor.
+          </para>
           <indexterm zone="emacs emacs-prog">
             <primary sortas="b-emacs">emacs</primary>
@@ -220,6 +254,8 @@
         <term><command>emacsclient</command></term>
         <listitem>
-          <para>attaches an <command>emacs</command> session to an already
-          running <command>emacsserver</command> instance.</para>
+          <para>
+            attaches an <command>emacs</command> session to an already
+            running <command>emacsserver</command> instance.
+          </para>
           <indexterm zone="emacs emacsclient">
             <primary sortas="b-emacsclient">emacsclient</primary>
@@ -231,6 +267,8 @@
         <term><command>etags</command></term>
         <listitem>
-          <para>is another program to generate source code
-          cross-reference tagfiles.</para>
+          <para>
+            is another program to generate source code
+            cross-reference tagfiles.
+          </para>
           <indexterm zone="emacs etags">
             <primary sortas="b-etags">etags</primary>
@@ -242,6 +280,8 @@
         <term><command>grep-changelog</command></term>
         <listitem>
-          <para>prints entries in Change Logs matching
-          various criteria.</para>
+          <para>
+            prints entries in Change Logs matching
+            various criteria.
+          </para>
           <indexterm zone="emacs grep-changelog">
             <primary sortas="b-grep-changelog">grep-changelog</primary>
@@ -253,5 +293,7 @@
         <term><command>rcs-checkin</command></term>
         <listitem>
-          <para>is a shell script used to check files into RCS.</para>
+          <para>
+            is a shell script used to check files into RCS.
+          </para>
           <indexterm zone="emacs rcs-checkin">
             <primary sortas="b-rcs-checkin">rcs-checkin</primary>
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/joe.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -30,7 +30,9 @@
     <title>Introduction to JOE</title>
 
-    <para><application>JOE</application> (Joe's own editor) is a small text
-    editor capable of emulating WordStar, <application>Pico</application>,
-    and <application>Emacs</application>.</para>
+    <para>
+      <application>JOE</application> (Joe's own editor) is a small text
+      editor capable of emulating WordStar, <application>Pico</application>,
+      and <application>Emacs</application>.
+    </para>
 
     &lfs91_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&joe-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&joe-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &joe-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &joe-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &joe-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &joe-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&joe-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&joe-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &joe-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &joe-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &joe-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &joe-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,6 +80,8 @@
     <title>Installation of JOE</title>
 
-    <para>Install <application>JOE</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>JOE</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr     \
@@ -74,7 +90,11 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
@@ -95,8 +115,12 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/joe/jmacsrc</filename>,
-      <filename>/etc/joe/joerc</filename>, <filename>/etc/joe/jpicorc</filename>,
-      <filename>/etc/joe/jstarrc</filename>, <filename>/etc/joe/rjoerc</filename>,
-      and <filename>~/.joerc</filename></para>
+      <para>
+        <filename>/etc/joe/jmacsrc</filename>,
+        <filename>/etc/joe/joerc</filename>,
+        <filename>/etc/joe/jpicorc</filename>,
+        <filename>/etc/joe/jstarrc</filename>,
+        <filename>/etc/joe/rjoerc</filename>,
+        and <filename>~/.joerc</filename>
+      </para>
 
       <indexterm zone="joe joe-config">
@@ -166,6 +190,8 @@
         <term><command>jmacs</command></term>
         <listitem>
-          <para>is a symbolic link to <command>joe</command> used to
-          launch <application>Emacs</application> emulation mode.</para>
+          <para>
+            is a symbolic link to <command>joe</command> used to
+            launch <application>Emacs</application> emulation mode.
+          </para>
           <indexterm zone="joe jmacs">
             <primary sortas="b-jmacs">jmacs</primary>
@@ -177,7 +203,9 @@
         <term><command>joe</command></term>
         <listitem>
-          <para>is a small text editor capable of emulating
-          WordStar, <application>Pico</application>, and
-          <application>Emacs</application>.</para>
+          <para>
+            is a small text editor capable of emulating
+            WordStar, <application>Pico</application>, and
+            <application>Emacs</application>.
+          </para>
           <indexterm zone="joe joe-prog">
             <primary sortas="b-joe">joe</primary>
@@ -189,6 +217,8 @@
         <term><command>jpico</command></term>
         <listitem>
-          <para>is a symbolic link to <command>joe</command> used to
-          launch <application>Pico</application> emulation mode.</para>
+          <para>
+            is a symbolic link to <command>joe</command> used to
+            launch <application>Pico</application> emulation mode.
+          </para>
           <indexterm zone="joe jpico">
             <primary sortas="b-jpico">jpico</primary>
@@ -200,6 +230,8 @@
         <term><command>jstar</command></term>
         <listitem>
-          <para>is a symbolic link to <command>joe</command> used to
-          launch WordStar emulation mode.</para>
+          <para>
+            is a symbolic link to <command>joe</command> used to
+            launch WordStar emulation mode.
+          </para>
           <indexterm zone="joe jstar">
             <primary sortas="b-jstar">jstar</primary>
@@ -211,7 +243,9 @@
         <term><command>rjoe</command></term>
         <listitem>
-          <para>is a symbolic link to <command>joe</command> that restricts
-          <application>JOE</application> to editing only files which are
-          specified on the command-line.</para>
+          <para>
+            is a symbolic link to <command>joe</command> that restricts
+            <application>JOE</application> to editing only files which are
+            specified on the command-line.
+          </para>
           <indexterm zone="joe rjoe">
             <primary sortas="b-rjoe">rjoe</primary>
@@ -223,7 +257,9 @@
         <term><command>stringify</command></term>
         <listitem>
-          <para>is a program used by <command>joe</command> to convert rc and
-          .jsf files into a C file (see
-          /usr/share/doc/joe-&joe-version;/util/README).</para>
+          <para>
+            is a program used by <command>joe</command> to convert rc and
+            .jsf files into a C file (see
+            /usr/share/doc/joe-&joe-version;/util/README).
+          </para>
           <indexterm zone="joe stringify">
             <primary sortas="b-stringify">stringify</primary>
@@ -235,7 +271,9 @@
         <term><command>termidx</command></term>
         <listitem>
-          <para>is a program used by <command>joe</command> to generate the
-          termcap index file (see
-          /usr/share/doc/joe-&joe-version;/util/README).</para>
+          <para>
+            is a program used by <command>joe</command> to generate the
+            termcap index file (see
+            /usr/share/doc/joe-&joe-version;/util/README).
+          </para>
           <indexterm zone="joe termidx">
             <primary sortas="b-termidx">termidx</primary>
@@ -247,9 +285,11 @@
         <term><command>uniproc</command></term>
         <listitem>
-          <para>is a program used by <command>joe</command> to generate joe's
-          unicode database file unicat.c from Blocks.txt CaseFolding.txt
-          EastAsianWidth.txt and UnicodeData.txt (find them at
-          /usr/share/doc/joe-&joe-version;/util; see 
-          usr/share/doc/joe-&joe-version;/util/README).</para>
+          <para>
+            is a program used by <command>joe</command> to generate joe's
+            unicode database file unicat.c from Blocks.txt CaseFolding.txt
+            EastAsianWidth.txt and UnicodeData.txt (find them at
+            /usr/share/doc/joe-&joe-version;/util; see 
+            usr/share/doc/joe-&joe-version;/util/README).
+          </para>
           <indexterm zone="joe uniproc">
             <primary sortas="b-uniproc">uniproc</primary>
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/nano.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -81,6 +81,8 @@
     <title>Installation of Nano</title>
 
-    <para>Install <application>Nano</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Nano</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr     \
@@ -119,6 +121,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/nanorc</filename> and
-      <filename>~/.nanorc</filename></para>
+      <para>
+        <filename>/etc/nanorc</filename> and
+        <filename>~/.nanorc</filename>
+      </para>
 
       <indexterm zone="nano nano-config">
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/editors/vim.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -32,19 +32,27 @@
     <title>Introduction to Vim</title>
 
-    <para>The <application>Vim</application> package, which is an
-    abbreviation for VI IMproved, contains a <command>vi</command>
-    clone with extra features as compared to the original
-    <command>vi</command>.</para>
-
-    <para>The default LFS instructions install <application>vim</application>
-    as a part of the base system. If you would prefer to link
-    <application>vim</application> against <application>X</application>,
-    you should recompile <application>vim</application> to enable GUI mode.
-    There is no need for special instructions since
-    <application>X</application> support is automatically detected.</para>
-
-    <note><para>The version of vim changes daily.  The get the latest 
-    version, go to <ulink url="https://github.com/vim/vim/releases">
-    https://github.com/vim/vim/releases</ulink>.</para></note>
+    <para>
+      The <application>Vim</application> package, which is an
+      abbreviation for VI IMproved, contains a <command>vi</command>
+      clone with extra features as compared to the original
+      <command>vi</command>.
+    </para>
+
+    <para>
+      The default LFS instructions install <application>vim</application>
+      as a part of the base system. If you would prefer to link
+      <application>vim</application> against <application>X</application>,
+      you should recompile <application>vim</application> to enable GUI mode.
+      There is no need for special instructions since
+      <application>X</application> support is automatically detected.
+    </para>
+
+    <note>
+      <para>
+        The version of vim changes daily.  The get the latest 
+        version, go to <ulink url="https://github.com/vim/vim/releases">
+        https://github.com/vim/vim/releases</ulink>.
+      </para>
+    </note>
 
     &lfs91_checked;
@@ -53,20 +61,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&vim-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&vim-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &vim-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &vim-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &vim-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &vim-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&vim-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&vim-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &vim-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &vim-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &vim-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &vim-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -99,16 +119,20 @@
 
     <note>
-      <para>If you recompile <application>Vim</application> to link against
-      <application>X</application> and your <application>X</application>
-      libraries are not on the root partition, you will no longer have an
-      editor for use in emergencies. You may choose to install an additional
-      editor, not link <application>Vim</application> against
-      <application>X</application>, or move the current <command>vim</command>
-      executable to the <filename class="directory">/bin</filename> directory
-      under a different name such as <filename>vi</filename>.</para>
+      <para>
+        If you recompile <application>Vim</application> to link against
+        <application>X</application> and your <application>X</application>
+        libraries are not on the root partition, you will no longer have an
+        editor for use in emergencies. You may choose to install an additional
+        editor, not link <application>Vim</application> against
+        <application>X</application>, or move the current <command>vim</command>
+        executable to the <filename class="directory">/bin</filename> directory
+        under a different name such as <filename>vi</filename>.
+      </para>
     </note>
 
-    <para>Install <application>Vim</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Vim</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>echo '#define SYS_VIMRC_FILE  "/etc/vimrc"' &gt;&gt;  src/feature.h &amp;&amp;
@@ -121,25 +145,31 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>.
-    The <application>vim</application> test suite outputs a lot of binary
-    data to the screen, which can cause issues with the settings of the
-    current terminal. This can be resolved by redirecting the output to a
-    log file. Even if one of the tests fails to produce the file
-    <filename>test.out</filename> in <filename
-    class="directory">src/testdir</filename>, the remaining tests will still
-    be executed. If all goes well,the log will report <literal>ALL DONE</literal>.
-    <emphasis>Note</emphasis>: Some color tests
-    expect to be executed under the <command>xterm</command> terminal
-    emulator. Three tests are known to fail occasionally and can be ignored.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make test</command>.  The
+      <application>vim</application> test suite outputs a lot of binary data
+      to the screen, which can cause issues with the settings of the current
+      terminal. This can be resolved by redirecting the output to a log file.
+      Even if one of the tests fails to produce the file
+      <filename>test.out</filename> in <filename
+      class="directory">src/testdir</filename>, the remaining tests will
+      still be executed. If all goes well,the log will report
+      <literal>ALL DONE</literal>.  <emphasis>Note</emphasis>: Some color
+      tests expect to be executed under the <command>xterm</command> terminal
+      emulator. Three tests are known to fail occasionally and can be ignored.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>By default, Vim's documentation is installed in <filename
-    class="directory">/usr/share/vim</filename>.  The following symlink allows
-    the documentation to be accessed via <filename
-    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making it
-    consistent with the location of documentation for other packages:</para>
+    <para>
+      By default, Vim's documentation is installed in <filename
+      class="directory">/usr/share/vim</filename>. The following symlink allows
+      the documentation to be accessed via <filename
+      class="directory">/usr/share/doc/vim-&vim-version;</filename>, making it
+      consistent with the location of documentation for other packages:
+    </para>
 
 <!-- When updating, be sure to change the vim-majmin entity for the 
@@ -148,13 +178,17 @@
 <screen role="root"><userinput>ln -snfv ../vim/vim&vim-majmin;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
-    <para>If you wish to update the runtime files, issue the
-    following command (requires <xref linkend="rsync"/>):</para>
+    <para>
+      If you wish to update the runtime files, issue the
+      following command (requires <xref linkend="rsync"/>):
+    </para>
 
 <screen><userinput>rsync -avzcP --exclude="/dos/" --exclude="/spell/" \
     ftp.nluug.nl::Vim/runtime/ ./runtime/</userinput></screen>
 
-    <para>To install the runtime files and regenerate the
-    <filename>tags</filename> file, as the
-    <systemitem class="username">root</systemitem> user issue:</para>
+    <para>
+      To install the runtime files and regenerate the
+      <filename>tags</filename> file, as the
+      <systemitem class="username">root</systemitem> user issue:
+    </para>
 
 <screen role="root"><userinput>make -C src installruntime &amp;&amp;
@@ -166,7 +200,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--with-features=huge</parameter>: This switch enables all
-    the additional features available in <application>Vim</application>,
-    including support for multibyte characters.</para>
+    <para>
+      <parameter>--with-features=huge</parameter>: This switch enables all
+      the additional features available in <application>Vim</application>,
+      including support for multibyte characters.
+    </para>
 
     <para>
@@ -176,17 +212,26 @@
     </para>
 
-    <para><option>--enable-gui=no</option>: This will prevent compilation of the
-    GUI. <application>Vim</application> will still link against
-    <application>X</application>, so that some features such as the client-server
-    model or the x11-selection (clipboard) are still available.</para>
-
-    <para><option>--without-x</option>: If you prefer not to link
-    <application>Vim</application> against <application>X</application>, use
-    this switch.</para>
-
-    <para><option>--enable-perlinterp</option>, <option>--enable-pythoninterp</option>,
-    <option>--enable-tclinterp</option>, <option>--enable-rubyinterp</option>:
-    These options include the Perl, Python, Tcl, or Ruby interpreters that allow
-    using other application code in <application>vim</application> scripts.</para>
+    <para>
+      <option>--enable-gui=no</option>: This will prevent compilation of the
+      GUI. <application>Vim</application> will still link against
+      <application>X</application>, so that some features such as the
+      client-server model or the x11-selection (clipboard) are still available.
+    </para>
+
+    <para>
+      <option>--without-x</option>: If you prefer not to link
+      <application>Vim</application> against <application>X</application>, use
+      this switch.
+    </para>
+
+    <para>
+      <option>--enable-perlinterp</option>,
+      <option>--enable-pythoninterp</option>,
+      <option>--enable-tclinterp</option>,
+      <option>--enable-rubyinterp</option>:
+      These options include the Perl, Python, Tcl, or Ruby interpreters that
+      allow using other application code in <application>vim</application>
+      scripts.
+    </para>
 
   </sect2>
@@ -198,6 +243,8 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/vimrc</filename> and
-      <filename>~/.vimrc</filename></para>
+      <para>
+        <filename>/etc/vimrc</filename> and
+        <filename>~/.vimrc</filename>
+      </para>
 
       <indexterm zone="vim vim-config">
@@ -240,37 +287,49 @@
       <title>Configuration Information</title>
 
-      <para><application>Vim</application> has an integrated spell checker
-      which you can enable it if you issue the following in a vim window:
+      <para>
+        <application>Vim</application> has an integrated spell checker
+        which you can enable it if you issue the following in a vim window:
       </para>
 
 <screen><literal>:setlocal spell spelllang=ru</literal></screen>
 
-      <para>This setting will enable spell checking for the Russian
-      language for the current session.</para>
-
-      <para>By default, <application>Vim</application> only installs spell
-      files for the English language. If a spell file is not available for
-      a language, then <application>Vim</application> will call the
-      <filename>$VIMRUNTIME/plugin/spellfile.vim</filename> plugin and will try
-      to obtain the *.spl and optionally *.sug from the vim ftp server,
-      by using the <filename>$VIMRUNTIME/plugin/netrwPlugin.vim</filename>
-      plugin.</para>
-
-<!-- When updating, be sure to change the line below for the proper 'vimxx' unpacked
-     directory -->
-      <para>Alternatively you can manually download the *.spl and *.sug files
-      from: <ulink url="ftp://ftp.vim.org/pub/vim/runtime/spell/"/> and save
-      them to <filename class="directory"> ~/.vim/spell </filename> or in
-      <filename class="directory">/usr/share/vim/vim&vim-majmin;/spell/</filename>.</para>
-
-      <para>To find out what's new in <application>Vim-&vim-version;</application>
-      issue the following command:</para>
+      <para>
+        This setting will enable spell checking for the Russian
+        language for the current session.
+      </para>
+
+      <para>
+        By default, <application>Vim</application> only installs spell
+        files for the English language. If a spell file is not available for
+        a language, then <application>Vim</application> will call the
+        <filename>$VIMRUNTIME/plugin/spellfile.vim</filename> plugin and will
+        try to obtain the *.spl and optionally *.sug from the vim ftp server,
+        by using the <filename>$VIMRUNTIME/plugin/netrwPlugin.vim</filename>
+        plugin.
+      </para>
+
+<!-- When updating, be sure to change the line below for the proper 'vimxx'
+     unpacked directory -->
+      <para>
+        Alternatively you can manually download the *.spl and *.sug files
+        from: <ulink url="ftp://ftp.vim.org/pub/vim/runtime/spell/"/> and save
+        them to <filename class="directory"> ~/.vim/spell </filename> or in
+        <filename
+          class="directory">/usr/share/vim/vim&vim-majmin;/spell/</filename>.
+      </para>
+
+      <para>
+        To find out what's new in <application>Vim-&vim-version;</application>
+        issue the following command:
+      </para>
 
 <screen><literal>:help version-&vim-version;</literal></screen>
 
-      <para>For additional information on setting up
-      <application>Vim</application> configuration files, see <xref
-      linkend="postlfs-config-vimrc"/> and <ulink
-      url='http://vim.wikia.com/wiki/Example_vimrc'/>.</para>
+      <para>
+        For additional information on setting up
+        <application>Vim</application> configuration files, see <xref
+        linkend="postlfs-config-vimrc"/> and <ulink
+        url='http://vim.wikia.com/wiki/Example_vimrc'/>.
+      </para>
 
     </sect3>
@@ -281,8 +340,10 @@
     <title>Contents</title>
 
-    <para>A list of the reinstalled files, along with their short
-    descriptions can be found in the <ulink
-    url="&lfs-root;/chapter06/vim.html#contents-vim">LFS Vim Installation
-    Instructions</ulink></para>
+    <para>
+      A list of the reinstalled files, along with their short
+      descriptions can be found in the <ulink
+      url="&lfs-root;/chapter06/vim.html#contents-vim">LFS Vim Installation
+      Instructions</ulink>
+    </para>
 
     <segmentedlist>
@@ -306,5 +367,7 @@
         <term><command>gview</command></term>
         <listitem>
-          <para>starts <command>gvim</command> in read-only mode.</para>
+          <para>
+            starts <command>gvim</command> in read-only mode.
+          </para>
           <indexterm zone="vim gview">
             <primary sortas="b-gview">gview</primary>
@@ -316,6 +379,8 @@
         <term><command>gvim</command></term>
         <listitem>
-          <para>is the editor that runs under <application>X</application>
-          and includes a GUI.</para>
+          <para>
+            is the editor that runs under <application>X</application>
+            and includes a GUI.
+          </para>
           <indexterm zone="vim gvim">
             <primary sortas="b-gvim">gvim</primary>
@@ -327,6 +392,8 @@
         <term><command>gvimdiff</command></term>
         <listitem>
-          <para>edits two or three versions of a file with
-          <command>gvim</command> and shows the differences.</para>
+          <para>
+            edits two or three versions of a file with
+            <command>gvim</command> and shows the differences.
+          </para>
           <indexterm zone="vim gvimdiff">
             <primary sortas="b-gvimdiff">gvimdiff</primary>
@@ -338,6 +405,8 @@
         <term><command>gvimtutor</command></term>
         <listitem>
-          <para>teaches the basic keys and commands of
-          <command>gvim</command>.</para>
+          <para>
+            teaches the basic keys and commands of
+            <command>gvim</command>.
+          </para>
           <indexterm zone="vim gvimtutor">
             <primary sortas="b-gvimtutor">gvimtutor</primary>
@@ -349,5 +418,7 @@
         <term><command>rgview</command></term>
         <listitem>
-          <para>is a restricted version of <command>gview</command>.</para>
+          <para>
+            is a restricted version of <command>gview</command>.
+          </para>
           <indexterm zone="vim rgview">
             <primary sortas="b-rgview">rgview</primary>
@@ -359,5 +430,7 @@
         <term><command>rgvim</command></term>
         <listitem>
-          <para>is a restricted version of <command>gvim</command>. </para>
+          <para>
+            is a restricted version of <command>gvim</command>.
+          </para>
           <indexterm zone="vim gvim">
             <primary sortas="b-gvim">gvim</primary>
Index: postlfs/shells/shells.xml
===================================================================
--- postlfs/shells/shells.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/shells/shells.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -16,8 +16,10 @@
   <title>Shells</title>
 
-  <para>We are all familiar with the Bourne Again SHell, but there are two
-  other user interfaces that are considered useful modern shells &ndash; the
-  Berkeley Unix C shell and the Korn shell.  This chapter installs
-  packages compatible with these additional shell types.</para>
+  <para>
+    We are all familiar with the Bourne Again SHell, but there are two
+    other user interfaces that are considered useful modern shells &ndash; the
+    Berkeley Unix C shell and the Korn shell.  This chapter installs
+    packages compatible with these additional shell types.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dash.xml"/>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/shells/tcsh.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -35,10 +35,12 @@
     <title>Introduction to Tcsh</title>
 
-    <para>The <application>Tcsh</application> package contains <quote>an
-    enhanced but completely compatible version of the Berkeley Unix C shell
-    (<command>csh</command>)</quote>. This is useful as an alternative shell
-    for those who prefer C syntax to that of the <command>bash</command> shell,
-    and also because some programs require the C shell in order to perform
-    installation tasks.</para>
+    <para>
+      The <application>Tcsh</application> package contains <quote>an
+      enhanced but completely compatible version of the Berkeley Unix C shell
+      (<command>csh</command>)</quote>. This is useful as an alternative shell
+      for those who prefer C syntax to that of the <command>bash</command>
+      shell, and also because some programs require the C shell in order to
+      perform installation tasks.
+    </para>
 
     &lfs91_checked;
@@ -47,20 +49,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tcsh-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tcsh-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tcsh-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tcsh-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tcsh-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tcsh-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tcsh-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tcsh-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tcsh-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tcsh-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tcsh-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tcsh-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -81,6 +95,8 @@
 sed -i 's|BSD_SOURCE|DEFAULT_SOURCE|g'  config/linux</userinput></screen>
 -->
-    <para>Install <application>Tcsh</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Tcsh</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
@@ -89,7 +105,11 @@
 sh ./tcsh.man2html</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install install.man &amp;&amp;
@@ -107,16 +127,22 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--bindir=/bin</parameter>: This installs the
-    <command>tcsh</command> program in <filename
-    class='directory'>/bin</filename> instead of <filename
-    class='directory'>/usr/bin</filename>.</para>
-
-    <para><command>sh ./tcsh.man2html</command>: This creates HTML documentation
-    from the formatted man page.</para>
-
-    <para><command>ln -v -sf tcsh /bin/csh</command>: The FHS states that if
-    there is a <application>C</application> shell installed, there should be a
-    symlink from <filename>/bin/csh</filename> to it. This creates that
-    symlink.</para>
+    <para>
+      <parameter>--bindir=/bin</parameter>: This installs the
+      <command>tcsh</command> program in <filename
+      class='directory'>/bin</filename> instead of <filename
+      class='directory'>/usr/bin</filename>.
+    </para>
+
+    <para>
+      <command>sh ./tcsh.man2html</command>: This creates HTML documentation
+      from the formatted man page.
+    </para>
+
+    <para>
+      <command>ln -v -sf tcsh /bin/csh</command>: The FHS states that if
+      there is a <application>C</application> shell installed, there should
+      be a symlink from <filename>/bin/csh</filename> to it. This creates
+      that symlink.
+    </para>
 
   </sect2>
@@ -128,12 +154,15 @@
       <title>Config Files</title>
 
-      <para>There are numerous configuration files for the C shell. Examples
-      of these are <filename>/etc/csh.cshrc</filename>,
-      <filename>/etc/csh.login</filename>, <filename>/etc/csh.logout</filename>,
-      <filename>~/.tcshrc</filename>, <filename>~/.cshrc</filename>,
-      <filename>~/.history</filename>, <filename>~/.cshdirs</filename>,
-      <filename>~/.login</filename>, and <filename>~/.logout</filename>. More
-      information on these files can be found in the
-      <filename>tcsh(1)</filename> man page.</para>
+      <para>
+        There are numerous configuration files for the C shell. Examples
+        of these are <filename>/etc/csh.cshrc</filename>,
+        <filename>/etc/csh.login</filename>,
+        <filename>/etc/csh.logout</filename>,
+        <filename>~/.tcshrc</filename>, <filename>~/.cshrc</filename>,
+        <filename>~/.history</filename>, <filename>~/.cshdirs</filename>,
+        <filename>~/.login</filename>, and <filename>~/.logout</filename>. More
+        information on these files can be found in the
+        <filename>tcsh(1)</filename> man page.
+      </para>
 
       <indexterm zone="tcsh tcsh-config">
@@ -178,7 +207,9 @@
       <title>Configuration Information</title>
 
-      <para>Update <filename>/etc/shells</filename> to include the C shell
-      program names (as the <systemitem class="username">root</systemitem>
-      user):</para>
+      <para>
+        Update <filename>/etc/shells</filename> to include the C shell
+        program names (as the <systemitem class="username">root</systemitem>
+        user):
+      </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
@@ -256,7 +287,9 @@
         <term><command>tcsh</command></term>
         <listitem>
-          <para>is an enhanced but completely compatible version of the
-          Berkeley Unix C shell, <command>csh</command>. It is usable as both an
-          interactive shell and a script processor.</para>
+          <para>
+            is an enhanced but completely compatible version of the
+            Berkeley Unix C shell, <command>csh</command>. It is usable as
+            both an interactive shell and a script processor.
+          </para>
           <indexterm zone="tcsh tcsh-prog">
             <primary sortas="b-tcsh">tcsh</primary>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/shells/zsh.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -33,9 +33,11 @@
     <title>Introduction to zsh</title>
 
-    <para>The <application>zsh</application> package contains a command
-    interpreter (shell) usable as an interactive login shell and as
-    a shell script command processor. Of the standard shells,
-    <application>zsh</application> most closely resembles
-    <application>ksh</application> but includes many enhancements.</para>
+    <para>
+      The <application>zsh</application> package contains a command
+      interpreter (shell) usable as an interactive login shell and as
+      a shell script command processor. Of the standard shells,
+      <application>zsh</application> most closely resembles
+      <application>ksh</application> but includes many enhancements.
+    </para>
 
     &lfs91_checked;
@@ -44,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&zsh-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&zsh-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &zsh-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &zsh-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &zsh-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &zsh-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&zsh-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&zsh-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &zsh-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &zsh-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &zsh-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &zsh-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,12 +80,18 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional Documentation: <ulink
-        url="http://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.xz"/></para>
-      </listitem>
-      <listitem>
-        <para>Documentation MD5 sum: &zsh-doc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Documentation download size: &zsh-doc-size;</para>
+        <para>
+          Optional Documentation: <ulink
+          url="http://www.zsh.org/pub/zsh-&zsh-version;-doc.tar.xz"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Documentation MD5 sum: &zsh-doc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Documentation download size: &zsh-doc-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -102,6 +122,8 @@
     <title>Installation of zsh</title>
 
-    <para>If you downloaded the optional documentation, unpack it with
-    the following command:</para>
+    <para>
+      If you downloaded the optional documentation, unpack it with
+      the following command:
+    </para>
 
 <screen><userinput>tar --strip-components=1 -xvf ../zsh-&zsh-version;-doc.tar.xz</userinput></screen>
@@ -115,6 +137,8 @@
     </note>
 -->
-    <para>Install <application>zsh</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>zsh</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr         \
@@ -128,13 +152,19 @@
 makeinfo  Doc/zsh.texi --html --no-split --no-headers -o Doc/zsh.html</userinput></screen>
 
-    <para>If you have <xref linkend="texlive"/>
-    installed, you can build PDF format of the documentation by issuing
-    the following command:</para>
+    <para>
+      If you have <xref linkend="texlive"/>
+      installed, you can build PDF format of the documentation by issuing
+      the following command:
+    </para>
 
 <screen remap="doc"><userinput>texi2pdf  Doc/zsh.texi -o Doc/zsh.pdf</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install                              &amp;&amp;
@@ -145,14 +175,18 @@
 install -v -m644 Doc/zsh.{html,txt} /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
-    <para>If you downloaded the optional documentation, install it by issuing
-    the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you downloaded the optional documentation, install it by issuing
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make htmldir=/usr/share/doc/zsh-&zsh-version;/html install.html &amp;&amp;
 install -v -m644 Doc/zsh.dvi /usr/share/doc/zsh-&zsh-version;</userinput></screen>
 
-    <para>If you built the PDF format of the documentation, install
-    it by issuing the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you built the PDF format of the documentation, install
+      it by issuing the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"
@@ -164,39 +198,51 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc/zsh</parameter> and
-    <parameter>--enable-etcdir=/etc/zsh</parameter>: These parameters are
-    used so that all the <application>zsh</application> configuration files
-    are consolidated into the <filename class='directory'>/etc/zsh</filename>
-    directory. Omit these parameters if you wish to retain historical
-    compatibility by having all the files located in the
-    <filename class='directory'>/etc</filename> directory.</para>
-
-    <para><parameter>--bindir=/bin</parameter>: This parameter places the
-    <command>zsh</command> binaries into the root filesystem.</para>
-
-    <para><option>--enable-cap</option>: This option enables
-    POSIX capabilities.</para>
-
-    <para><option>--disable-gdbm</option>: This option disables the
-    use of the <application>GDBM</application> library.</para>
-
-    <para><option>--enable-pcre</option>: This option allows zsh to use
-    the <application>PCRE</application> regular expression library in shell
-    builtins.</para>
+    <para>
+      <parameter>--sysconfdir=/etc/zsh</parameter> and
+      <parameter>--enable-etcdir=/etc/zsh</parameter>: These parameters are
+      used so that all the <application>zsh</application> configuration files
+      are consolidated into the <filename class='directory'>/etc/zsh</filename>
+      directory. Omit these parameters if you wish to retain historical
+      compatibility by having all the files located in the
+      <filename class='directory'>/etc</filename> directory.
+    </para>
+
+    <para>
+      <parameter>--bindir=/bin</parameter>: This parameter places the
+      <command>zsh</command> binaries into the root filesystem.
+    </para>
+
+    <para>
+      <option>--enable-cap</option>: This option enables
+      POSIX capabilities.
+    </para>
+
+    <para>
+      <option>--disable-gdbm</option>: This option disables the
+      use of the <application>GDBM</application> library.
+    </para>
+
+    <para>
+      <option>--enable-pcre</option>: This option allows zsh to use
+      the <application>PCRE</application> regular expression library in shell
+      builtins.
+    </para>
 
     <sect3 id="mountpoints">
       <title>Multiple partitions</title>
 
-      <para>Linking <application>zsh</application> dynamically against
-      <application>pcre</application> and/or <application>gdbm</application>
-      produces runtime dependencies on <filename class='libraryfile'>
-      libpcre.so</filename> and/or <filename class='libraryfile'>libgdbm.so
-      </filename>respectively, which both reside in
-      <filename class='directory'>/usr</filename> hierarchy. If
-      <filename class='directory'>/usr</filename> is a separate mount point
-      and <application>zsh</application> needs to be available in boot time,
-      then its supporting libraries should be in
-      <filename class='directory'>/lib</filename> too. You can move the
-      libraries as follows:</para>
+      <para>
+        Linking <application>zsh</application> dynamically against
+        <application>pcre</application> and/or <application>gdbm</application>
+        produces runtime dependencies on <filename class='libraryfile'>
+        libpcre.so</filename> and/or <filename class='libraryfile'>libgdbm.so
+        </filename>respectively, which both reside in
+        <filename class='directory'>/usr</filename> hierarchy. If
+        <filename class='directory'>/usr</filename> is a separate mount point
+        and <application>zsh</application> needs to be available in boot time,
+        then its supporting libraries should be in
+        <filename class='directory'>/lib</filename> too. You can move the
+        libraries as follows:
+      </para>
 
 <screen role="root"><userinput>mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
@@ -207,8 +253,11 @@
 </screen>
 
-      <para>Alternatively you can statically link <application>zsh</application>
-      against <application>pcre</application> and <application>gdbm</application>
-      if you modify the <filename>config.modules</filename> file (you need first
-      to run configure to generate it).</para>
+      <para>
+        Alternatively you can statically link <application>zsh</application>
+        against <application>pcre</application> and
+        <application>gdbm</application> if you modify the
+        <filename>config.modules</filename> file (you need first to run
+        configure to generate it).
+      </para>
 
     </sect3>
@@ -222,13 +271,15 @@
       <title>Config Files</title>
 
-      <para>There are a whole host of configuration files for
-      <application>zsh</application> including
-      <filename>/etc/zsh/zshenv</filename>,
-      <filename>/etc/zsh/zprofile</filename>,
-      <filename>/etc/zsh/zshrc</filename>,
-      <filename>/etc/zsh/zlogin</filename> and
-      <filename>/etc/zsh/zlogout</filename>.
-      You can find more information on these in the <filename>zsh(1)</filename>
-      and related manual pages.</para>
+      <para>
+        There are a whole host of configuration files for
+        <application>zsh</application> including
+        <filename>/etc/zsh/zshenv</filename>,
+        <filename>/etc/zsh/zprofile</filename>,
+        <filename>/etc/zsh/zshrc</filename>,
+        <filename>/etc/zsh/zlogin</filename> and
+        <filename>/etc/zsh/zlogout</filename>.
+        You can find more information on these in the
+        <filename>zsh(1)</filename> and related manual pages.
+      </para>
 
       <para>
@@ -246,5 +297,6 @@
         <command>promptinit</command>. Available prompt names are listed with
         <command>prompt -l</command>. Select a particular one with
-        <command>prompt <literal>&lt;prompt-name&gt;</literal></command>. Display all available
+        <command>prompt <literal>&lt;prompt-name&gt;</literal></command>.
+        Display all available
         prompts with <command>prompt -p</command>. Except for the list and
         display commands above, you can insert the other ones in
@@ -278,7 +330,9 @@
       <title>Configuration Information</title>
 
-      <para>Update <filename>/etc/shells</filename> to include the
-      <application>zsh</application> shell program names (as the
-      <systemitem class="username">root</systemitem> user):</para>
+      <para>
+        Update <filename>/etc/shells</filename> to include the
+        <application>zsh</application> shell program names (as the
+        <systemitem class="username">root</systemitem> user):
+      </para>
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
@@ -314,7 +368,9 @@
         <term><command>zsh</command></term>
         <listitem>
-          <para>is a shell which has command-line editing, built-in spelling
-          correction, programmable command completion, shell functions (with
-          autoloading), a history mechanism, and a host of other features.</para>
+          <para>
+            is a shell which has command-line editing, built-in spelling
+            correction, programmable command completion, shell functions (with
+            autoloading), a history mechanism, and a host of other features.
+          </para>
           <indexterm zone="zsh zsh-prog">
             <primary sortas="b-zsh">zsh</primary>
Index: postlfs/virtualization/virtualization.xml
===================================================================
--- postlfs/virtualization/virtualization.xml	(revision 29244b73b3857d77173c51d4cc661c1d49b975ba)
+++ postlfs/virtualization/virtualization.xml	(revision f716ef4508a349d5ec3d77aad3be01d4597ba95c)
@@ -16,9 +16,11 @@
   <title>Virtualization</title>
 
-  <para>Virtualization allows running a complete operating system, or virtual
-  machine (VM), within another operating environment as a task.  There are
-  several commercial and open source environments that either emulate another
-  processor or utilize the hardware virtualization features of the host
-  processor.</para>
+  <para>
+    Virtualization allows running a complete operating system, or virtual
+    machine (VM), within another operating environment as a task.  There are
+    several commercial and open source environments that either emulate another
+    processor or utilize the hardware virtualization features of the host
+    processor.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu.xml"/>
