Index: admin.xml
===================================================================
--- admin.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ admin.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -20,33 +20,21 @@
   <para>These programs are useful for system administration on most systems.</para>
 
+  <xi:include xmlns:xi="&xinclude;" href="networking/netutils/bind-utils.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/connect/dhcpcd.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="general/sysutils/fcron.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="general/sysutils/gpm.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/hdparm.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/lm_sensors.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="general/sysutils/logrotate.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/hdparm.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/pciutils.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/usbutils.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/connect/dhcpcd.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/netutils/bind-utils.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/net-tools.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/ntp.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/pciutils.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="server/mail/postfix.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/rsync.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/netutils/traceroute.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/usbutils.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/wireless-tools.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/wpa_supplicant.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/netutils/traceroute.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="server/mail/postfix.xml"/>
-
-<!--
-
- net-tools-cvs_20101030
- ntp-4.2.8p12
- rsync-3.1.3
- wireless tools-29
- wpa_supplicant-2.6
- traceroute-2.1.0
- postfix-3.3.1
 
 
-
--->
-
 </chapter>
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/genlib/libtasn1.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -75,13 +75,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-<!--      <xref linkend="six"/> -->
-    </para>
-<!--
+      <xref linkend="six"/> 
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
-    </para>
--->
+      <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+      <ulink url="&blfs-book;general/valgrind.html">valgrind</ulink>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libtasn1"/>
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/genlib/libusb.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -72,10 +72,10 @@
 
     <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
--->
+      <ulink url="&blfs-book;general/doxygen.html">doxygen</ulink>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libusb"/>
@@ -156,10 +156,10 @@
       <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
     </indexterm>
-<!--
-    <para>
-      For more details on setting up USB devices, see <xref
-      linkend="usb-device-issues"/>.
-    </para>
--->
+
+    <para>
+      For more details on setting up USB devices, see 
+      <xref linkend="usb-device-issues"/>.
+    </para>
+
   </sect2>
 
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/genlib/popt.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -71,8 +71,9 @@
 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
-<!--
-    <para>If you have <xref linkend="doxygen"/> installed and wish to build
+
+    <para>If you have <ulink url="&blfs-book;general/doxygen.html">doxygen</ulink>
+    installed and wish to build
     the API documentation, issue <command>doxygen</command>.</para>
--->
+
     <para>To test the results, issue:<command>make check</command>.</para>
 
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/prog/python2.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -90,17 +90,17 @@
 
     <bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/> and
-      <xref linkend="valgrind"/>
+      <ulink url="&blfs-book;general/bluez.html">bluez</ulink> and
+      <ulink url="&blfs-book;general/valgrind.html">valgrind</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
     <para role="optional">
-      <xref linkend="sqlite"/> and
-      <xref linkend="tk"/>
-    </para>
--->
+      <ulink url="&blfs-book;server/sqlite.html">sqlite</ulink> and
+      <ulink url="&blfs-book;general/tk.html">tk</ulink>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/Python"/>
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/cpio.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -58,10 +58,11 @@
 
     <bridgehead renderas="sect3">CPIO Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+      <ulink url="&blfs-book;pst/texlive.html">texlive</ulink> 
+      (or <ulink url="&blfs-book;pst/tl-installer.html">tl-installer</ulink> 
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/cpio"/></para>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/fcron.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
+<sect1 id="fcron" xreflabel="fcron-&fcron-version;">
   <?dbhtml filename="fcron.html"?>
 
@@ -58,25 +58,16 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">An <xref linkend="server-mail"/>,
-    <ulink url="../postlfs/editors.html">text editor</ulink> (default is
-    <command>vi</command> from the <xref linkend="vim"/> package),
-    <xref linkend="linux-pam"/>, and
-    <xref linkend="docbook-utils"/>
+    <para role="optional">
+      A mail server such as <xref linkend="postfix"/>,
+      A text editor
+        (default is <command>vi</command> from the vim package),
+      <ulink url="&blfs-book;/postlfs/linux-pam.html">linux-pam</ulink>, and
+      <ulink url="&blfs-book;/postlfs/pst/docbook-utils.html">docbook-utils</ulink>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/fcron"/></para>
@@ -87,17 +78,18 @@
     <title>Installation of Fcron</title>
 
-    <para id="fcron-syslog" revision="sysv"><application>Fcron</application>
+    <para id="fcron-syslog"> For System V versions of LFS, 
+    <application>fcron</application>
     uses the cron facility of <command>syslog</command> to log all messages.
     Since LFS does not set up this facility in
     <filename>/etc/syslog.conf</filename>, it needs to be done prior to
-    installing <application>Fcron</application>. This command will append the
+    installing <application>fcron</application>. This command will append the
     necessary line to the current <filename>/etc/syslog.conf</filename>
     (perform as the <systemitem class='username'>root</systemitem> user):</para>
 
-    <indexterm zone="fcron fcron-syslog" revision="sysv">
+    <indexterm zone="fcron fcron-syslog">
       <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
     </indexterm>
 
-<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
 <literal># Begin fcron addition to /etc/syslog.conf
 
@@ -107,12 +99,12 @@
 EOF</userinput></screen>
 
-    <para revision="sysv">The configuration file has been modified, so reloading
+    <para>The configuration file has been modified, so reloading
     the <command>sysklogd</command> daemon will activate the changes (again as
     the <systemitem class='username'>root</systemitem> user).</para>
 
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen>
+<screen role="root"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen>
 
     <para>For security reasons, an unprivileged user and group for
-    <application>Fcron</application> should be created (perform as the
+    <application>fcron</application> should be created (perform as the
     <systemitem class='username'>root</systemitem> user):</para>
 
@@ -123,5 +115,7 @@
     commands:</para>
 
-<screen revision="sysv"><userinput>./configure --prefix=/usr          \
+    <para>For System V based systems:</para>
+
+<screen><userinput>./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --localstatedir=/var   \
@@ -131,5 +125,7 @@
 make</userinput></screen>
 
-<screen revision="systemd"><userinput>./configure --prefix=/usr          \
+    <para>For systemd based systems:</para>
+
+<screen><userinput>./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --localstatedir=/var   \
@@ -150,11 +146,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!--
-    <para><command>autoconf</command>: This command is required to rebuild
-    <filename>configure</filename> using the fixed input file.</para>-->
 
     <para><parameter>--without-sendmail</parameter>: By default,
-    <application>Fcron</application> will attempt to use the
-    <command>sendmail</command> command from an <!--<xref linkend="server-mail"/>-->
+    <application>fcron</application> will attempt to use the
+    <command>sendmail</command> command from a mail server sucj as the 
+    <xref linkend="postfix"/>
     package to email you the results of the <command>fcron</command> script.
     This switch is used to disable default email notification. Omit the switch
@@ -166,5 +160,5 @@
     installation of the bootscript included with the package.</para>
 
-    <para revision="sysv"><parameter>--with-systemdsystemunitdir=no</parameter>:
+    <para><parameter>--with-systemdsystemunitdir=no</parameter>:
     This prevents building the <application>systemd</application> units, which
     are not needed for a <application>SYS V</application> system.</para>
@@ -173,8 +167,12 @@
     This switch allows you to set the default text editor.</para>
 
-    <para><option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
-    May be used if you have <!--<xref linkend="docbook-utils"/>--> installed.
+    <para>
+      <option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
+    May be used if you have 
+    <ulink url="&blfs-book;/postlfs/pst/docbook-utils.html">docbook-utils</ulink>
+    installed.
     Currently, the dsssl stylesheets are located at
-    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
+    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.
+    </para>
 
   </sect2>
@@ -234,12 +232,13 @@
 
     <sect3  id="fcron-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">Install the
+      <title>Boot Script or Systemd Unit</title>
+
+      <para>For System V bases systems, install the
       <filename>/etc/rc.d/init.d/fcron</filename> init script from the
       <xref linkend="bootscripts"/> package.</para>
 
-      <para revision="systemd">Enable <application>fcron</application> to start
+<screen role="root"><userinput>make install-fcron</userinput></screen>
+
+      <para>For systemd based systems, enable <application>fcron</application> to start
       at boot using the previously installed systemd unit.</para>
 
@@ -248,7 +247,5 @@
       </indexterm>
 
-<screen role="root" revision="sysv"><userinput>make install-fcron</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable fcron</userinput></screen>
+<screen role="root"><userinput>systemctl enable fcron</userinput></screen>
 
     </sect3>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/gpm.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -130,6 +130,5 @@
 
     <sect3 id="gpm-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
+      <title>Boot Script or Systemd Unit</title>
 
       <indexterm zone="gpm gpm-init">
@@ -137,11 +136,13 @@
       </indexterm>
 
-      <para revision="sysv">Install the
-      <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <para revision="systemd">
-        To start the <command>gpm</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
+      <para>
+        For System V based systems, install the
+        <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
+        <xref linkend="bootscripts"/> package.
+      </para>
+
+      <para>
+        For systemd based systems, to start the <command>gpm</command> daemon 
+        at boot, install the systemd unit from the <xref linkend="systemd-units"/>
         package by running the following command as the
         <systemitem class="username">root</systemitem> user:
@@ -159,10 +160,10 @@
       <command>gpm-root</command> configuration files.</para>
 
-      <para revision="sysv"><filename>/etc/sysconfig/mouse</filename>:
+      <para><filename>/etc/sysconfig/mouse</filename> (System V only):
       This file contains the name of your mouse device and the protocol
       it uses.  To create this file, run the following as the
       <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"
 <literal># Begin /etc/sysconfig/mouse
 
@@ -182,5 +183,5 @@
       </indexterm>
 
-      <indexterm zone="gpm gpm-config" revision="sysv">
+      <indexterm zone="gpm gpm-config">
         <primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
       </indexterm>
@@ -191,12 +192,12 @@
       <title>Configuration Information</title>
 
-      <para revision="sysv">Examples of values to set <envar>MDEVICE</envar>,
+      <para>System V:Examples of values to set <envar>MDEVICE</envar>,
       <envar>PROTOCOL</envar>, and <envar>GPMOPTS</envar> to are:</para>
 
-<screen revision="sysv"><literal>MDEVICE="/dev/input/mice"
+<screen><literal>MDEVICE="/dev/input/mice"
 PROTOCOL="imps2"
 GPMOPTS=""</literal></screen>
 
-      <para revision="sysv">A list of which protocol values are known can be
+      <para>A list of which protocol values are known can be
       found by running
       <command>gpm -m <replaceable>[device]</replaceable> -t -help</command>.
@@ -208,6 +209,6 @@
       are needed for your hardware.</para>
 
-      <para revision="systemd">
-        <application>GPM</application> is by default started with
+      <para>
+        systemd: <application>GPM</application> is by default started with
         the following parameters:
         <parameter>-m /dev/input/mice -t imps2</parameter>. If the
@@ -217,5 +218,5 @@
       </para>
 
-<screen role="root" revision="systemd"><userinput>install -v -dm755 /etc/systemd/system/gpm.service.d
+<screen role="root"><userinput>install -v -dm755 /etc/systemd/system/gpm.service.d
 echo "ExecStart=/usr/sbin/gpm &lt;list of parameters&gt;" > /etc/systemd/system/gpm.service.d/99-user.conf</userinput></screen>
 
Index: general/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/logrotate.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -82,10 +82,10 @@
       <xref role="runtime" linkend="fcron"/> (runtime)
     </para>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      An <xref role="runtime" linkend="server-mail"/> (runtime)
-    </para>
--->
+      A mail seerver such as <xref role="runtime" linkend="postfix"/> (runtime)
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/logrotate"/>
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/pciutils.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -129,6 +129,8 @@
       <command>update-pciids</command> as the <systemitem
       class="username">root</systemitem> user. This program requires the
-      <xref linkend="which"/> script or program to find <!--<xref linkend="curl"/>,
-      <xref linkend="lynx"/>--> or <xref linkend="wget"/> which are used to
+      <xref linkend="which"/> script or program to find 
+      <ulink url="&blfs-book;basicnet/curl.html">curl</ulink>,
+      <ulink url="&blfs-book;basicnet/lynx.html">lynx</ulink> or 
+      <xref linkend="wget"/> which are used to
       download the most current file, and then replace the existing file in
       <filename class="directory">/usr/share/hwdata</filename>.
@@ -235,6 +237,5 @@
           <para>
             fetches the current version of the PCI ID list. Requires
-         <!--   <xref linkend="curl"/>, <xref linkend="lynx"/> or-->
-            <xref linkend="wget"/>.
+            curl, lynx, or wget.
           </para>
           <indexterm zone="pciutils update-pciids">
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ general/sysutils/usbutils.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -127,28 +127,18 @@
 
   </sect2>
-<!-- No longer needed
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... lsusb.py</command>: Instructs lsusb.py where to search
-      <filename>usb.ids</filename>.
-    </para>
-
-  </sect2>
--->
+
   <sect2 role="configuration">
     <title>Configuring USB Utils</title>
 
-    <para revision="sysv">
+    <para>
       The <filename>usb.ids</filename> data file is constantly being updated.
-      To get a current version of this file, using <xref linkend="wget"/>,
-      periodically run again, as the
+      For System V based systems, get a current version of this file, using 
+      <xref linkend="wget"/>, periodically run, as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root" revision="sysv"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
-
-    <para revision="sysv">
+<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
+
+    <para>
       You may wish to add an entry to
       <systemitem class="username">root</systemitem>'s (or any other user who has
@@ -158,12 +148,12 @@
     </para>
 
-    <para revision="systemd">
-      You should update the <filename>/usr/share/hwdata/usb.ids</filename> file
-      periodically. Execute the following commands, as the
+    <para>
+      For systemd based systems, 
+      execute the following commands, as the
       <systemitem class="username">root</systemitem> user, to create a systemd
       timer to update it weekly on Sundays at 3:00 A.M. (local time):
     </para>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root"><userinput>cat &gt; /lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update usb.ids file
Index: introduction/important/starting.xml
===================================================================
--- introduction/important/starting.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ introduction/important/starting.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -77,5 +77,5 @@
 
     <para>
-      When you initially boot into LFS, you have all the interal tools to build
+      When you initially boot into LFS, you have all the internal tools to build
       additional packages. Unfortunately, the user environment is quite sparse.
       There are a couple of ways to improve this: 
Index: libraries.xml
===================================================================
--- libraries.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ libraries.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -18,14 +18,13 @@
   <title>Libraries</title>
 
-  <para>These libraries support programs in this book.</para>
+  <para>These libraries support programs in this book. If desired
+  they can be built in the order presented below.</para>
 
-  <xi:include xmlns:xi="&xinclude;" href="general/genlib/libtasn1.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="postlfs/security/p11-kit.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnl.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libtirpc.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/genlib/libusb.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="general/genlib/popt.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="general/genlib/libusb.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnl.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/rpcsvc-proto.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libnsl.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/libtirpc.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="networking/netlibs/rpcsvc-proto.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="lwp-protocol-https.xml"/>
   <sect1 id="pymods" xreflabel="six-&six-version; (Python Module)">
@@ -33,4 +32,6 @@
     <xi:include xmlns:xi="&xinclude;" href="general/prog/six.xml"/>
   </sect1>
+  <xi:include xmlns:xi="&xinclude;" href="general/genlib/libtasn1.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="postlfs/security/p11-kit.xml"/>
 
 <!--
Index: lwp-protocol-https.xml
===================================================================
--- lwp-protocol-https.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ lwp-protocol-https.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -5,4 +5,5 @@
   %general-entities;
 
+  <!ENTITY perl_authors "https://www.cpan.org/authors">
   <!ENTITY LWP-Protocol-https-download-http "&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
   <!ENTITY LWP-Protocol-https-md5sum "b8943dfb7d187af63c36fc18ab15947d">
@@ -32,4 +33,17 @@
     </indexterm>
 
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>Explicit download of this package is not necessary when using
+      auto installation instructions.</para>
+    </note>
+
     <para>LWP::Protocol::https provides https support for
     LWP::UserAgent (i.e. for LWP). This module uses 
@@ -44,9 +58,9 @@
     <title>Auto Installation of Perl Modules.</title>
 
-    <para>Install Perl modules using the
-    <command>cpan</command> shell <command>install</command> command. The
-    command automatically downloads the source from the CPAN archive, extracts
-    it, runs the compilation, testing and installation commands mentioned
-    above. 
+    <para>
+      Install Perl modules using the <command>cpan</command> shell
+      <command>install</command> command. The command automatically downloads
+      the source from the CPAN archive, extracts it, runs the compilation,
+      testing and installation commands mentioned above. 
     </para>
 
Index: networking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/connect/dhcpcd.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -61,10 +61,10 @@
 
     <bridgehead renderas="sect3">dhcpcd Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="llvm"/> (with Clang)
+      <ulink url="&blfs-book;general/llvm.html">llvm</ulink> (with Clang)
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/dhcpcd"/></para>
@@ -207,10 +207,10 @@
     </sect3>
 
-    <sect3 id="dhcpcd-init2" revision="sysv">
-      <title>Configuration Information: fixed ip</title>
+    <sect3 id="dhcpcd-init2">
+      <title>Configuration Information: fixed ip (System V versions of LFS)</title>
 
       <para id="dhcpcd-config4">Although not usual, it is possible that you need
-        to configure <application>dhcpcd</application> to use a fixed ip. Here,
-        we give an example. As the
+        to configure <application>dhcpcd</application> to use a fixed ip. Here
+        we give an example for the System V versions of LFS. As the
         <systemitem class="username">root</systemitem> user create the
         <filename>/etc/sysconfig/ifconfig.eth0</filename> configuration file
@@ -243,6 +243,6 @@
     </sect3>
 
-   <sect3 id="dhcpcd-init3" revision="systemd">
-      <title>General Configuration Information</title>
+   <sect3 id="dhcpcd-init3">
+      <title>General Configuration Information for systemd versions of LFS</title>
 
       <para>
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netlibs/libnl.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -100,12 +100,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">libnl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="check"/> (for tests)
-    </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libnl"/>
Index: networking/netlibs/libnsl.xml
===================================================================
--- networking/netlibs/libnsl.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netlibs/libnsl.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -72,24 +72,10 @@
     </itemizedlist>
 
-<!--
-   Not needed.  I fixed the url.
-
-    <note>
-      <para>
-        The <application>libnsl</application> source tarball shown above
-        downloads with the correct name, libnsl-&libnsl-version;.tar.gz, if
-        using a standard web browser. If you prefer to use a command line
-        program such as wget, you normally would obtain &libnsl-version;.tar.gz.
-        To obtain this package with the proper filename, run:
-
-<screen><userinput>wget -c https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz -O libnsl-&libnsl-version;.tar.gz</userinput></screen>
-      </para>
-    </note>
--->
     <bridgehead renderas="sect3">libnsl Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="rpcsvc-proto"/> and <xref linkend="libtirpc"/>
+      <xref linkend="rpcsvc-proto"/> and 
+      <xref linkend="libtirpc"/>
     </para>
 
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netlibs/libtirpc.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -74,10 +74,11 @@
 
     <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="mitkrb"/> for the GSSAPI
+      <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>
+        for the GSSAPI
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libtirpc"/>
@@ -87,8 +88,10 @@
   <sect2 role="installation">
     <title>Installation of libtirpc</title>
-<!--
+
     <note><para>If updating this package, you will also need to update 
-    any existing version of <xref linkend='rpcbind'/></para></note>
--->
+    any existing version of 
+    <ulink url="&blfs-book;basicnet/rpcbind..html">rpcbind</ulink>
+    </para></note>
+
 
 <screen><userinput>./configure --prefix=/usr                                   \
@@ -117,11 +120,13 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
-<!--
+
     <para>
       <parameter>- -disable-gssapi</parameter>: This switch is needed if
       no GSSAPI is installed. Remove this switch if you have one
-      installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
+      installed 
+      (for example <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>) 
+      and you wish to use it.
     </para>
--->
+
     <para>
       <command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netprogs/ntp.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -78,6 +78,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-<!--      <xref linkend="libcap-pam"/>,
-      <xref linkend="libevent"/>, -->
+      <ulink url="&blfs-book;postlfs/libcap.html">libcap with PAM</ulink>,
+      <ulink url="&blfs-book;basicnet/libevent.html">libevent</ulink>, 
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>, and
       <ulink url="https://www.gnu.org/software/autogen/">libopts from AutoGen</ulink>
@@ -242,16 +242,16 @@
 
       <para>If you choose Option one, then install the
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/ntp</filename>
-      init script</phrase>
-      <phrase revision="systemd"><filename>ntpd.service</filename> unit</phrase>
+      <filename>/etc/rc.d/init.d/ntp</filename>
+      init script (System V based systems) or the 
+      <filename>ntpd.service</filename> unit (systemd based systems)
       included in the
-      <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
-
-      <indexterm zone="ntp ntp-init" revision="sysv">
+      <xref linkend="bootscripts"/> or 
+      <xref linkend="systemd-units"/> packages respectively.</para>
+
+      <indexterm zone="ntp ntp-init">
         <primary sortas="f-ntp">ntp</primary>
       </indexterm>
 
-      <indexterm zone="ntp ntp-init" revision="systemd">
+      <indexterm zone="ntp ntp-init">
         <primary sortas="f-ntpd">ntpd.service</primary>
       </indexterm>
@@ -265,13 +265,12 @@
 <screen><literal>ntpd -q</literal></screen>
 
-      <para revision="sysv">Execute the following command if you would like to
+      <para>For System V systems, execute the following command if you would like to
       set the hardware clock to the current system time at shutdown and
       reboot:</para>
 
-<screen role="root" revision="sysv"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
+<screen role="root"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
 ln -v -sf ../init.d/setclock /etc/rc.d/rc6.d/K46setclock</userinput></screen>
 
-      <para revision="sysv">The other way around is already set up by
-      LFS.</para>
+      <para>The other way around is already set up by LFS.</para>
 
     </sect3>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netprogs/rsync.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -89,8 +89,10 @@
 <screen><userinput>./configure --prefix=/usr --without-included-zlib &amp;&amp;
 make</userinput></screen>
-<!--
-    <para>If you have <xref linkend="doxygen"/> installed and wish to
+
+    <para>If you have 
+    <ulink url="&blfs-book;general/doxygen.html">doxygen</ulink> 
+    installed and wish to
     build HTML API documentation, issue <command>doxygen</command>.</para>
--->
+
     <para>To test the results, issue: <command>make check</command>.</para>
 
@@ -165,33 +167,31 @@
 
     <sect3 id="rsync-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
+      <title>Boot Script or Systemd Unit</title>
 
       <para>Note that you only want to start the
       <application>rsync</application> server if you want to provide an
       <application>rsync</application> archive on your local machine.
-      You don't need this <phrase revision="sysv">script</phrase>
-      <phrase revision="systemd">unit</phrase> to run the
+      You don't need this script or unit to run the
       <application>rsync</application> client.</para>
 
       <para>Install the
-      <phrase revision="sysv"><filename>/etc/rc.d/init.d/rsyncd</filename> init
-      script</phrase>
-      <phrase revision="systemd"><filename>rsyncd.service</filename>
-      unit</phrase> included in the
-      <xref linkend="bootscripts" revision="sysv"/>
-      <xref linkend="systemd-units" revision="systemd"/> package.</para>
+      <filename>/etc/rc.d/init.d/rsyncd</filename> init script (for
+      System V bades systems) or the <filename>rsyncd.service</filename>
+      unit (for systemd based systems) included in the
+      <xref linkend="bootscripts"/>
+      <xref linkend="systemd-units"/> packages respectively.</para>
 
 <screen role="root"><userinput>make install-rsyncd</userinput></screen>
 
-      <note revision="systemd">
-        <para>This package comes with two types of units: A service file and a
+      <note>
+        <para>For systemd use, this package comes with two types of units: 
+        A service file and a
         socket file. The service file will start rsync daemon once at boot
         and it will keep running until the system shuts down. The socket file
-        will make systemd listen on rsync port (Default 873, needs to be
+        will make systemd listen on the rsync port (Default 873, needs to be
         edited for anything else) and will start rsync daemon when something
         tries to connect to that port and stop the daemon when the connection
         is terminated. This is called socket activation and is analogous to
-        using <application>{,x}inetd</application> on a SysVinit based 
+        using <application>{,x}inetd</application> on a System V based 
         system.</para>
 
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netprogs/wpa_supplicant.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -93,12 +93,12 @@
       <xref linkend="libnl"/> 
     </para>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="qt5"/>
-    </para>
--->
+      <ulink url="&blfs-book;general/dbus.html">D-Bus</ulink>,
+      <ulink url="&blfs-book;general/libxml2.html">libxml2</ulink>, and
+      <ulink url="&blfs-book;x/qt5.html">qt5</ulink>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/wpa_supplicant"/>
@@ -175,13 +175,14 @@
 CFLAGS += -I/usr/include/libnl3</literal>
 EOF</userinput></screen>
-<!--
+
     <para>
       If you wish to use <application>WPA Supplicant</application> with
-      <xref linkend="NetworkManager"/>, make sure that you have installed
-      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
+      <ulink url="&blfs-book;basicnet/networkmanager.html">NetworkManager</ulink>, 
+      make sure that you have installed
+      D-Bus and libxml2, then add the
       following options to the <application>WPA Supplicant</application>
       build configuration file by running the following command:
     </para>
--->
+
 <screen><userinput>cat &gt;&gt; wpa_supplicant/.config &lt;&lt; "EOF"
 <literal>CONFIG_CTRL_IFACE_DBUS=y
@@ -198,7 +199,7 @@
 cd wpa_supplicant                                         &amp;&amp;
 make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
-<!--
-    <para>
-      If you have installed <xref linkend="qt5"/> and wish to build
+
+    <para>
+      If you have installed qt5 and wish to build
       the <application>WPA Supplicant</application> GUI program, run
       the following commands:
@@ -206,6 +207,6 @@
 
     <note><para>The following directory name is labelled qt4, but 
-    is compatible with <xref linkend="qt5"/>.</para></note>
--->
+    is compatible with qt5.</para></note>
+
 <screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
 qmake wpa_gui.pro &amp;&amp;
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ networking/netutils/bind-utils.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -32,5 +32,7 @@
     <para><application>BIND Utilities</application> is not a separate
     package, it is a collection of the client side programs that are included
-    with <!--<xref linkend="bind"/>-->. The <application>BIND</application>
+    with 
+    <ulink url="&blfs-book;server/bind.html">bind</ulink>.
+    The <application>BIND</application>
     package includes the client side programs <command>nslookup</command>,
     <command>dig</command> and <command>host</command>. If you install
@@ -65,11 +67,11 @@
 
     <bridgehead renderas="sect3">BIND Utilities Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap-pam"/> and
-      <xref linkend="libxml2"/>
+      <ulink url="&blfs-book;postlfs/libcap.html">libcap with PAM</ulink>
+      <ulink url="&blfs-book;general/libxml2.html">libxml2</ulink>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/bind-utils"/></para>
@@ -127,5 +129,6 @@
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
-    <para>See the program descriptions in the <!-- <xref linkend="bind"/> -->
+    <para>See the program descriptions in the 
+    <ulink url="&blfs-book;server/bind.html">bind</ulink>
     section.</para>
 
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ postlfs/filesystems/parted.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -70,17 +70,15 @@
 
     <bridgehead renderas="sect3">Parted Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lvm2"/> (device-mapper, required if building
-      <application>udisks</application>)
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pth"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
--->
+      <ulink url="&blfs-book;postlfs/lvm2.html">LVM2</ulink>
+        (needed for device-mapper, required if building
+        <application>udisks</application>),
+      <ulink url="&blfs-book;general/pth.html">pth</ulink>, and
+      <ulink url="&blfs-book;pst/texlive.html">texlive</ulink>
+      (or <ulink url="&blfs-book;pst/tl-installer.html">tl-installer</ulink>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/parted"/>
@@ -110,9 +108,4 @@
 makeinfo --html      -o doc/html       doc/parted.texi &amp;&amp;
 makeinfo --plaintext -o doc/parted.txt doc/parted.texi</userinput></screen>
-
-<!--
-    <para>If you have <xref linkend="texlive"/> installed and wish to create
-    PDF and Postcript documentation issue the following commands:</para>
--->
 
 <screen><userinput>texi2pdf             -o doc/parted.pdf doc/parted.texi &amp;&amp;
Index: postlfs/security/p11-kit.xml
===================================================================
--- postlfs/security/p11-kit.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ postlfs/security/p11-kit.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -81,7 +81,7 @@
     <para role="optional">
       <xref linkend="make-ca"/> (runtime), 
-   <!--   <xref linkend="nss"/> (runtime),
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="libxslt"/>-->
+      <ulink url="&blfs-book;postlfs/nss.html">nss</ulink> (runtime),
+      <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+      <ulink url="&blfs-book;general/libxslt.html">libxslt</ulink>
     </para>
 
@@ -133,6 +133,7 @@
     <para>
       <option>--enable-doc</option>: Use this switch if you have installed
- <!--     <xref linkend="gtk-doc"/> and <xref linkend="libxslt"/> -->and wish to
-      rebuild the documentation and generate manual pages.
+      <ulink url="&blfs-book;general/gtk-doc.html">gtk-doc</ulink> and
+      <ulink url="&blfs-book;general/libxslt.html">libxslt</ulink>
+      and wish to rebuild the documentation and generate manual pages.
     </para>
 
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ server/databases/db.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -72,16 +72,15 @@
 
     <bridgehead renderas="sect3">Berkeley DB Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="tcl"/> and
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
--->
-      <!--,
+      <ulink url="&blfs-book;general/tcl.html">tcl</ulink> and
+      <ulink url="&blfs-book;general/sharutils.html">sharutils</ulink>
+        (for the <command>uudecode</command> command)
+    </para>
+      <!--
       <xref linkend="openjdk"/> or <xref linkend="java"/>, and
-- -          This is currently broken, removed for now.                - -
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command
-      - Java bindings are required) -->
-<!--    </para> -->
+          This is currently broken, removed for now.   
+       Java bindings are required) -->
 
     <para condition="html" role="usernotes">
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
+++ server/mail/postfix.xml	(revision 639733379e54dc2c39d03041b950d46d27860d4e)
@@ -79,20 +79,22 @@
     <para role="recommended">
       <xref linkend="db"/>,
-      <!--<xref linkend="cyrus-sasl"/>, and-->
       <xref linkend="libnsl"/>
     </para>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="icu"/> for Email Address Internationalization (SMTPUTF8) support,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>, and
+      <ulink url="&blfs-book;postlfs/libcap.html">cyrus-sasl</ulink>, 
+      <ulink url="&blfs-book;general/icu.html">icu</ulink> 
+        for Email Address Internationalization (SMTPUTF8) support,
+      <ulink url="&blfs-book;server/mariadb.html">mariadb</ulink> or 
+      <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <ulink url="&blfs-book;server/openldap.html">openldap</ulink>,
+      <ulink url="&blfs-book;general/pcre.html">pcre</ulink>,
+      <ulink url="&blfs-book;server/postgresql.html">postgresql</ulink>,
+      <ulink url="&blfs-book;server/sqlite.html">sqlite</ulink>, and
       <ulink url="http://cr.yp.to/cdb.html">CDB</ulink> or
       <ulink url="http://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink>
     </para>
--->
+
     <para>
       Note that <application>SQLite</application>,
@@ -410,15 +412,14 @@
 
     <sect3 id="postfix-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
+      <title>Boot Script or Systemd Unit</title>
 
       <para>
         To automate the running of Postfix at startup, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/postfix</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>postfix.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package.
+        <filename>/etc/rc.d/init.d/postfix</filename>
+        init script (for System V based systems) or 
+        <filename>postfix.service</filename> unit (for systemd based systems)
+        included in the
+        <xref linkend="bootscripts"/> or 
+        <xref linkend="systemd-units"/> packages respectively.
       </para>
 
