Index: cmdline.xml
===================================================================
--- cmdline.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ cmdline.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -18,9 +18,45 @@
   <para>These tools are recommended for all systems.</para>
 
-  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/which.xml"/>
+  <para>Openssh provides both an ssh client and a server.  Setting
+  up a server allows logging into the system from another system allowing
+  control, including building of additional packages, from a full 
+  graphical environment.</para>
+
+  <para>Wget allows retrieval of packages from the command line.</para>
+
+  <para>Make-ca provides for installing security certificates of well
+  known certificate authorities so applications can properly authenticate
+  entities such as an https:// URL across an untrusted network.</para>
+
+  <para>Sudo allows otherwise untrusted users to run commands that 
+  require administrative privileges. It is a convenient alternative
+  to the su command.</para>
+
+  <para>Which is a convenient utility that shows the full path to a
+  command.</para>
+
+  <para>Unzip is an extraction utility for zip files.  It's function is
+  similar to gzip. gzip2, and xz that were installed in LFS.</para>
+
+  <para>Links is a text mode WWW browser.  Text mode browsers are
+  very fast and can be used before a graphical environment is installed.
+  </para>
+
+  <para>Mailx is a a command-line Mail User Agent (MUA).  It is especially
+  useful for sending mail messages in scripts.</para>
+
+  <note>
+    <para>
+      When building BLFS packages, manny will require the installation of
+      dependent packages before that are built.  See <xref linkend='dependencies'/>
+      to help decide which dependent packages you need.
+    </para>
+  </note>
+
+  <xi:include xmlns:xi="&xinclude;" href="postlfs/security/openssh.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/netprogs/wget.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="postlfs/security/make-ca.xml"/>
-  <xi:include xmlns:xi="&xinclude;" href="postlfs/security/openssh.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="postlfs/security/sudo.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/which.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="general/sysutils/unzip.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="networking/textweb/links.xml"/>
Index: general.ent
===================================================================
--- general.ent	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ general.ent	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "Bruce Dubbs">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 18th, &year;">
+<!ENTITY releasedate  "September 21at, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -22,4 +22,5 @@
 <!ENTITY blfs-root       "&lfs-webroot;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/stable/">
+<!ENTITY blfs-bookd      "&blfs-root;view/stable-systemd/">
 
 <!ENTITY xinclude "http://www.w3.org/2001/XInclude">
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ general/sysutils/unzip.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -46,7 +46,7 @@
       tested. <!--Note that the patch recommended for the locale issues will not
       apply to this version of <application>UnZip</application>. See the
-      discussion below in <xref linkend="unzip-locale-issues"/>. --> A more
+      discussion below in <xref linkend="unzip-locale-issues"/>. A more
       general discussion of these problems can be found in the
-<!--      <xref linkend="locale-assumed-encoding"/> section of the
+      <xref linkend="locale-assumed-encoding"/> section of the
       <xref linkend="locale-issues"/> page.-->
       </para>
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ general/sysutils/which.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -4,6 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-<!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
 
   <!ENTITY which-download-http "&gnu-http;/which/which-&which-version;.tar.gz">
Index: intro.xml
===================================================================
--- intro.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ intro.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -17,4 +17,5 @@
 
   <xi:include xmlns:xi="&xinclude;" href="introduction/important/starting.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="introduction/welcome/conventions.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="introduction/important/building-notes.xml"/>
   <xi:include xmlns:xi="&xinclude;" href="introduction/important/patches.xml"/>
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ introduction/welcome/conventions.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -92,5 +92,5 @@
   </sect2>
 
-  <sect2>
+  <sect2 id="dependencies">
   <title>Conventions Used for Package Dependencies</title>
 
Index: libraries.xml
===================================================================
--- libraries.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ libraries.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -29,6 +29,6 @@
   <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="Python Mpdules">
-    <title>Python Mpdules</title>
+  <sect1 id="pymods" xreflabel="six-&six-version; (Python Module)">
+    <title>six-&six-version; (Python Module)</title>
     <xi:include xmlns:xi="&xinclude;" href="general/prog/six.xml"/>
   </sect1>
Index: lwp-protocol-https.xml
===================================================================
--- lwp-protocol-https.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ lwp-protocol-https.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -17,5 +17,5 @@
   </sect1info>
 
-  <title>Perl Modules</title>
+  <title>LWP::Protocol::https-&LWP-Protocol-https-version; (Perl Module)</title>
 
   <sect2 role="package">
@@ -34,5 +34,7 @@
     <para>LWP::Protocol::https provides https support for
     LWP::UserAgent (i.e. for LWP). This module uses 
-    <xref linkend="perl-auto-install"/>.</para>
+    <xref linkend="perl-auto-install"/>:.</para>
+
+<screen><userinput>cpan -i LWP::Protocol::https</userinput></screen>
 
   </sect2>
Index: networking/mailnews/mailx.xml
===================================================================
--- networking/mailnews/mailx.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ networking/mailnews/mailx.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -75,15 +75,18 @@
 
     <bridgehead renderas="sect3">Heirloom mailx Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl10"/> or
-    <xref linkend="nss"/>,
-    <xref linkend="mitkrb"/> (for IMAP GSSAPI
-    authentication), and an
-    <xref linkend="server-mail"/></para>
+    <para role="optional">
+      <ulink url="&blfs-book;postlfs/openssl10.html">openssl-1.0.x</ulink> or
+      <ulink role="runtime" url="&blfs-book;postlfs/nss.html">nss</ulink>,
+      <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>
+         (for IMAP GSSAPI authentication), and 
+      <xref linkend="postfix"/> (or an equivalent package that provides a
+          <command>sendmail</command> command) 
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mailx"/></para>
--->
+
   </sect2>
 
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ networking/netprogs/wget.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -79,18 +79,20 @@
       <xref role="runtime" linkend="make-ca"/> (runtime)
     </para>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gnutls"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="perl-http-daemon"/> (for the test suite),
-      <xref linkend="perl-io-socket-ssl"/> (for the test suite),
-      <xref linkend="libidn2"/>,
-      <xref linkend="libpsl"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="python2"/> (built with ssl; for the test suite), and
-      <xref linkend="valgrind"/> (for the test suite)
-    </para>
--->
+      <ulink url="&blfs-book;postlfs/gnutls.html">gnutls</ulink>,
+      <ulink url="&blfs-book;postlfs/gpgme.html">gpgme</ulink>,
+      <ulink url="&blfs-book;general/perl-modules.html#perl-http-daemon">
+        perl-http-daemon</ulink> (for the test suite),
+      <ulink url="&blfs-book;general/perl-modules.html#perl-io-socket-ssl">
+        perl-io-socket-ssl"</ulink> (for the test suite),
+      <ulink url="&blfs-book;general/libidn2.html">libidn2</ulink>,
+      <ulink url="&blfs-bookd;basicnet/libpsl.html">libpsl</ulink>,
+      <ulink url="&blfs-book;general/pcre.html">pcre</ulink>,
+      <xref linkend="python"/> (for the test suite), and
+      <ulink url="&blfs-book;general/valgrind.html">valgrind</ulink> (for the test suite)
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/wget"/>
@@ -133,5 +135,5 @@
     <para>
       <parameter>--with-ssl=openssl</parameter>: This allows the program to use
-      openssl instead of <!--<xref linkend="gnutls"/>. -->
+      openssl instead of <ulink url="&blfs-book;postlfs/gnutls.html">gnutls</ulink>.
     </para>
 
@@ -161,14 +163,4 @@
         <primary sortas="e-etc-wgetrc">/etc/wgetrc</primary>
       </indexterm>
-
-<!--
-      <para>
-        If you have installed <xref linkend="make-ca"/> and you want
-        <application>Wget</application> to use them, as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo ca-directory=/etc/ssl/certs >> /etc/wgetrc</userinput></screen>
--->
 
     </sect3>
Index: networking/textweb/links.xml
===================================================================
--- networking/textweb/links.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ networking/textweb/links.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -60,9 +60,5 @@
 
     <bridgehead renderas="sect3">Links Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="openssl"/></para>
--->
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">Graphics mode requires at least one of
@@ -70,16 +66,17 @@
     <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
     <ulink url="http://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>, and
-    <xref linkend="x-window-system"/></para>
+    <ulink url="&blfs-book;x/installing.html">x-window-system</ulink>
+    </para>
 
     <para>For decoding various image formats <application>Links</application>
     can utilize
-    <xref linkend="libpng"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="librsvg"/>, and
-    <xref linkend="libtiff"/></para>
+    <ulink url="&blfs-book;general/libpng.html">libpng</ulink>,
+    <ulink url="&blfs-book;general/libjpeg.html">libjpeg</ulink>,
+    <ulink url="&blfs-book;general/librsvg.html">librsvg</ulink>, and
+    <ulink url="&blfs-book;general/libtiff.html">libtiff</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/LinksBrowser"/></para>
--->
+
   </sect2>
 
Index: postlfs/security/make-ca.xml
===================================================================
--- postlfs/security/make-ca.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ postlfs/security/make-ca.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -75,5 +75,5 @@
 
     <bridgehead renderas="sect3">make-ca Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="p11-kit"/> (required at runtime to
@@ -82,10 +82,10 @@
    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
     <para role="optional">
-      <xref role="runtime" linkend="java"/> or
-      <xref role="runtime" linkend="openjdk"/> (to generate a java PKCS#12
-      store), and <xref role="runtime" linkend="nss"/> (to generate a shared
-      NSSDB)
+      <ulink role="runtime" url="&blfs-book;general/openjdk.html">OpenJDK</ulink> 
+        (to generate a java PKCS#12 store), and 
+      <ulink role="runtime" url="&blfs-book;postlfs/nss.html">nss</ulink> 
+        (to generate a shared NSSDB)
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/make-ca'/></para>
@@ -97,5 +97,5 @@
     <para>The <application>make-ca</application> script will download and
     process the certificates included in the <filename>certdata.txt</filename>
-    file for use as trust anchors for the <!-- <xref linkend="p11-kit"/> -->trust
+    file for use as trust anchors for the <xref linkend="p11-kit"/> trust
     module. Additionally, it will generate system certificate stores used by
     BLFS applications (if the recommended and optional applications are present
@@ -146,5 +146,5 @@
 
    <para>As the <systemitem class="username">root</systemitem> user, after
-   installing <!--<xref linkend="p11-kit"/>-->, download the certificate source and
+   installing <xref linkend="p11-kit"/>, download the certificate source and
    prepare for system use with the following command:</para>
 
@@ -171,5 +171,6 @@
     for use that might be preferred for one reason or another, including the
     files shipped with Mozilla products in this book. RedHat and OpenSUSE,
-    for instance, use the version included in <!--<xref linkend="nss"/>-->. Additional
+    for instance, use the version included in 
+    <ulink role="runtime" url="&blfs-book;postlfs/nss.html">nss</ulink>. Additional
     upstream downloads are available at the links below.</para>
 
Index: postlfs/security/openssh.xml
===================================================================
--- postlfs/security/openssh.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ postlfs/security/openssh.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -87,16 +87,10 @@
 
     <bridgehead renderas="sect3">OpenSSH Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openssl"/> or
-      <ulink url="http://www.libressl.org/">LibreSSL Portable</ulink></para>
--->
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="x-window-system"/>,
-      <xref linkend="mitkrb"/>,
+      <ulink url="&blfs-book;/postlfs/linux-pam.html">linux-pam</ulink>,
+      <ulink url="&blfs-book;x/installing.html">x-window-system</ulink>,
+      <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>,
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>,
       <ulink url="http://www.libressl.org/">LibreSSL Portable</ulink>,
@@ -107,9 +101,9 @@
     <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
     <para role="optional">
-      <xref role="runtime" linkend="openjdk"/>,
-      <xref role="runtime" linkend="net-tools"/>, and
-      <xref role="runtime" linkend="sysstat"/>
-    </para>
--->
+      <ulink role="runtime" url="&blfs-book;general/openjdk.html">OpenJDK</ulink>,
+      <ulink role="runtime" url="&blfs-book;basicnet/net-tools.html">net-tools</ulink>, and
+      <ulink role="runtime" url="&blfs-book;general/sysstat.html">sysstat</ulink>
+    </para>
+
     <para condition="html" role="usernotes">
         User Notes: <ulink url="&blfs-wiki;/OpenSSH"/>
@@ -321,15 +315,16 @@
 
     <sect3  id="openssh-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To start the SSH server at system boot, install the
+      <title>Installing the Boot Script or Systemd Unit</title>
+
+      <para>
+        If using the System V version of LFS, you can start the SSH server at 
+        system boot by installing the
         <filename>/etc/rc.d/init.d/sshd</filename> init script included
         in the <xref linkend="bootscripts"/> package.
       </para>
 
-      <para revision="systemd">
-        To start the SSH server at system boot, install the
+      <para>
+        If using the systemd version of LFS, you can start the SSH server at
+        system boot by installing the
         <filename>sshd.service</filename> unit included in the
         <xref linkend="systemd-units"/> package.
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 57e3994dcd1844c911b762993efacb95cd867478)
+++ postlfs/security/sudo.xml	(revision acf7e2cff94e6c1a123e58c153c8dc5859e6901d)
@@ -75,17 +75,16 @@
 
     <bridgehead renderas="sect3">Sudo Dependencies</bridgehead>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command),
+      <ulink url="&blfs-book;/postlfs/linux-pam.html">linux-pam</ulink>,
+      <ulink url="&blfs-book;postlfs/mitkrb.html">MIT Kerberos</ulink>,
+      <ulink url="&blfs-book;postlfs/openldap.html">openldap</ulink>
+      <xref linkend="postfix"/> (or an equivalent package that provides a
+        <command>sendmail</command> command),
       <ulink url="http://www.openafs.org/">AFS</ulink>,
       <ulink url="http://www.fwtk.org/">FWTK</ulink>, and
       <ulink url="&sourceforge-dl;/opie/">Opie</ulink>
     </para>
--->
 
     <para condition="html" role="usernotes">User Notes:
