Author: bdubbs
Date: Tue Sep 18 15:03:52 2018
New Revision: 20509

Log:
Initial commit of basic branch

Added:
   branches/basic/
      - copied from r20497, trunk/BOOK/
   branches/basic/admin.xml   (contents, props changed)
   branches/basic/cmdline.xml   (contents, props changed)
   branches/basic/intro.xml   (contents, props changed)
   branches/basic/libraries.xml   (contents, props changed)
   branches/basic/lwp-protocol-https.xml   (contents, props changed)
   branches/basic/support.xml   (contents, props changed)
Deleted:
   branches/basic/archive/
Modified:
   branches/basic/Makefile
   branches/basic/book/bookinfo.xml
   branches/basic/general.ent
   branches/basic/general/genlib/libtasn1.xml
   branches/basic/general/genlib/libusb.xml
   branches/basic/general/genlib/popt.xml
   branches/basic/general/prog/python2.xml
   branches/basic/general/sysutils/cpio.xml
   branches/basic/general/sysutils/fcron.xml
   branches/basic/general/sysutils/logrotate.xml
   branches/basic/general/sysutils/pciutils.xml
   branches/basic/general/sysutils/unzip.xml
   branches/basic/index.xml
   branches/basic/introduction/important/bootscripts.xml
   branches/basic/introduction/important/building-notes.xml
   branches/basic/introduction/important/important.xml
   branches/basic/introduction/important/la-files.xml
   branches/basic/introduction/important/libraries.xml
   branches/basic/introduction/important/systemd-units.xml
   branches/basic/introduction/introduction.xml
   branches/basic/introduction/welcome/conventions.xml
   branches/basic/introduction/welcome/welcome.xml
   branches/basic/networking/connect/dhcpcd.xml
   branches/basic/networking/mailnews/mailx.xml
   branches/basic/networking/netlibs/libtirpc.xml
   branches/basic/networking/netprogs/ntp.xml
   branches/basic/networking/netprogs/rsync.xml
   branches/basic/networking/netprogs/wget.xml
   branches/basic/networking/netprogs/wpa_supplicant.xml
   branches/basic/networking/netutils/bind-utils.xml
   branches/basic/networking/textweb/links.xml
   branches/basic/postlfs/config/bootdisk.xml
   branches/basic/postlfs/config/config.xml
   branches/basic/postlfs/config/console-fonts.xml
   branches/basic/postlfs/config/devices.xml
   branches/basic/postlfs/config/firmware.xml
   branches/basic/postlfs/filesystems/parted.xml
   branches/basic/postlfs/postlfs.xml
   branches/basic/postlfs/security/make-ca.xml
   branches/basic/postlfs/security/openssh.xml
   branches/basic/postlfs/security/p11-kit.xml
   branches/basic/postlfs/security/sudo.xml
   branches/basic/server/databases/db.xml
   branches/basic/server/mail/postfix.xml

Modified: branches/basic/Makefile
==============================================================================
--- trunk/BOOK/Makefile Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/Makefile     Tue Sep 18 15:03:52 2018        (r20509)
@@ -32,7 +32,7 @@
 endif
 
 ifeq ($(REV), sysv)
-  BASEDIR         ?= $(HOME)/public_html/blfs-book
+  BASEDIR         ?= $(HOME)/public_html/basic-blfs-book
   NOCHUNKS_OUTPUT ?= blfs-book.html
   DUMPDIR         ?= ~/blfs-commands
   BLFSHTML        ?= blfs-html.xml

Added: branches/basic/admin.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/admin.xml    Tue Sep 18 15:03:52 2018        (r20509)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+
+  <!ENTITY xinclude "http://www.w3.org/2001/XInclude";>
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="admin" xreflabel="Administration Tools">
+  <?dbhtml filename="admin.html"?>
+
+  <title>Administration Tools</title>
+
+  <para>These programs are useful for system administration on most 
systems.</para>
+
+  <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/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="networking/netprogs/rsync.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>

Modified: branches/basic/book/bookinfo.xml
==============================================================================
--- trunk/BOOK/book/bookinfo.xml        Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/book/bookinfo.xml    Tue Sep 18 15:03:52 2018        (r20509)
@@ -10,7 +10,7 @@
   <othername>$LastChangedBy$</othername>
   <date>$Date$</date>
 
-  <title>Beyond Linux<superscript>&reg;</superscript> From Scratch<phrase 
revision="systemd"> (systemd edition)</phrase></title>
+  <title>Basic Packages for Linux<superscript>&reg;</superscript> From 
Scratch</title>
   <subtitle>Version &version;</subtitle>
 
   <authorgroup>
@@ -22,7 +22,7 @@
   <pubdate>&pubdate;</pubdate>
 
   <copyright id="copyright">
-    <year>2001-&year;</year>
+    <year>2018-&year;</year>  <!-- Yes it will be 2018-1018 for now -->
     <holder>&copyholder;</holder>
   </copyright>
 
@@ -42,119 +42,18 @@
 
   <revhistory>
     <revision>
-      <revnumber>&version;</revnumber>
+      <!--<revnumber>&version;</revnumber>-->
       <date>&pubdate;</date>
-      <revremark>Ongoing Release</revremark>
+      <revremark>Development Release</revremark>
     </revision>
 
-    <revision>
-      <revnumber>8.2</revnumber>
-      <date>2018-03-02</date>
-      <revremark>Seventeenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.1</revnumber>
-      <date>2017-09-01</date>
-      <revremark>Sixteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>8.0</revnumber>
-      <date>2017-02-25</date>
-      <revremark>Fifteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.10</revnumber>
-      <date>2016-09-07</date>
-      <revremark>Fourteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.9</revnumber>
-      <date>2016-03-08</date>
-      <revremark>Thirteenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.8</revnumber>
-      <date>2015-10-01</date>
-      <revremark>Twelfth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.7</revnumber>
-      <date>2015-03-06</date>
-      <revremark>Eleventh release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.6</revnumber>
-      <date>2014-09-23</date>
-      <revremark>Tenth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.5</revnumber>
-      <date>2014-03-05</date>
-      <revremark>Ninth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>7.4</revnumber>
-      <date>2013-09-14</date>
-      <revremark>Eighth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.3</revnumber>
-      <date>2008-08-24</date>
-      <revremark>Seventh release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.2.0</revnumber>
-      <date>2007-02-14</date>
-      <revremark>Sixth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.1</revnumber>
-      <date>2005-08-14</date>
-      <revremark>Fifth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>6.0</revnumber>
-      <date>2005-04-02</date>
-      <revremark>Fourth release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>5.1</revnumber>
-      <date>2004-06-05</date>
-      <revremark>Third release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>5.0</revnumber>
-      <date>2003-11-06</date>
-      <revremark>Second release</revremark>
-    </revision>
-
-    <revision>
-      <revnumber>1.0</revnumber>
-      <date>2003-04-25</date>
-      <revremark>First release</revremark>
-    </revision>
   </revhistory>
 
   <abstract>
-    <para>This book follows on from the Linux From Scratch book. It introduces
-    and guides the reader through additions to the system including networking,
-    graphical interfaces, sound support, and printer and scanner
-    support.</para>
+    <para>
+      This book is an excerpt of the Beyond Linux From Scratch book. It 
+      provides suggested applications that are useful for all LFS users.
+    </para>
   </abstract>
 
 </bookinfo>

Added: branches/basic/cmdline.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/cmdline.xml  Tue Sep 18 15:03:52 2018        (r20509)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="cmdline" xreflabel="Command Line Tools">
+  <?dbhtml filename="cmdline.html"?>
+
+  <title>Command Line Tools</title>
+
+  <para>These tools are recommended for all systems.</para>
+
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/which.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/unzip.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/textweb/links.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="networking/mailnews/mailx.xml"/>
+
+</chapter>

Modified: branches/basic/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/general.ent  Tue Sep 18 15:03:52 2018        (r20509)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
-<!ENTITY copyrightdate "2001-&year;">
-<!ENTITY copyholder   "The BLFS Development Team">
+<!ENTITY copyrightdate "2018-&year;">
+<!ENTITY copyholder   "Bruce Dubbs">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 10th, &year;">
+<!ENTITY releasedate  "September 18th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
@@ -18,6 +18,12 @@
 <!ENTITY maintainer-firstname "BLFS">
 <!ENTITY maintainer-address   "blfs-maintainer@&lfs-domainname;">
 
+<!ENTITY lfs-webroot     "http://www.linuxfromscratch.org/";>
+<!ENTITY blfs-root       "&lfs-webroot;blfs/">
+<!ENTITY blfs-book       "&blfs-root;view/stable/">
+
+<!ENTITY xinclude "http://www.w3.org/2001/XInclude";>
+
 
 <!ENTITY lfs-website          "http://www.&lfs-domainname;";>
 <!-- downloads_root must have an entity because it is needed for scripts

Modified: branches/basic/general/genlib/libtasn1.xml
==============================================================================
--- trunk/BOOK/general/genlib/libtasn1.xml      Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/genlib/libtasn1.xml  Tue Sep 18 15:03:52 2018        
(r20509)
@@ -74,15 +74,15 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="six"/>
+<!--      <xref linkend="six"/> -->
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gtk-doc"/> and
       <xref linkend="valgrind"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libtasn1"/>
     </para>

Modified: branches/basic/general/genlib/libusb.xml
==============================================================================
--- trunk/BOOK/general/genlib/libusb.xml        Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/genlib/libusb.xml    Tue Sep 18 15:03:52 2018        
(r20509)
@@ -71,12 +71,12 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="doxygen"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libusb"/>
     </para>
@@ -155,12 +155,12 @@
     <indexterm zone="libusb libusb-kernel">
       <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>
-
+-->
   </sect2>
 
   <sect2 role="content">

Modified: branches/basic/general/genlib/popt.xml
==============================================================================
--- trunk/BOOK/general/genlib/popt.xml  Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/general/genlib/popt.xml      Tue Sep 18 15:03:52 2018        
(r20509)
@@ -70,10 +70,10 @@
 
 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
-
+<!--
     <para>If you have <xref linkend="doxygen"/> installed and wish to build
     the API documentation, issue <command>doxygen</command>.</para>
-
+-->
     <para>To test the results, issue:<command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>

Modified: branches/basic/general/prog/python2.xml
==============================================================================
--- trunk/BOOK/general/prog/python2.xml Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/general/prog/python2.xml     Tue Sep 18 15:03:52 2018        
(r20509)
@@ -90,11 +90,6 @@
 
     <bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
 <!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libffi"/>
-    </para>
--->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="bluez"/> and
@@ -106,15 +101,6 @@
       <xref linkend="sqlite"/> and
       <xref linkend="tk"/>
     </para>
-<!--
-    <note>
-      <para>
-        If you are building <xref linkend="thunderbird"/> or
-        <xref linkend="firefox"/>
-        you must install <application>openssl</application> before you build
-        <application>Python 2</application>.
-      </para>
-    </note>
 -->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/Python"/>

Modified: branches/basic/general/sysutils/cpio.xml
==============================================================================
--- trunk/BOOK/general/sysutils/cpio.xml        Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/sysutils/cpio.xml    Tue Sep 18 15:03:52 2018        
(r20509)
@@ -57,12 +57,12 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">CPIO Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/cpio"/></para>
 
@@ -83,7 +83,7 @@
 makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &amp;&amp;
 makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
 
-    <para>If you have <xref linkend="texlive"/>
+    <para>If you have <!-- <xref linkend="texlive"/> -->
     installed and wish to create PDF or Postscript documentation, issue one or
     both of the following commands:</para>
 

Modified: branches/basic/general/sysutils/fcron.xml
==============================================================================
--- trunk/BOOK/general/sysutils/fcron.xml       Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/sysutils/fcron.xml   Tue Sep 18 15:03:52 2018        
(r20509)
@@ -69,7 +69,7 @@
     </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
@@ -77,7 +77,7 @@
     <xref linkend="linux-pam"/>, and
     <xref linkend="docbook-utils"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/fcron"/></para>
 
@@ -155,7 +155,7 @@
 
     <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"/>
+    <command>sendmail</command> command from an <!--<xref 
linkend="server-mail"/>-->
     package to email you the results of the <command>fcron</command> script.
     This switch is used to disable default email notification. Omit the switch
     to enable the default. Alternatively, you can use the
@@ -173,7 +173,7 @@
     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.
+    May be used if you have <!--<xref linkend="docbook-utils"/>--> installed.
     Currently, the dsssl stylesheets are located at
     <filename 
class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.</para>
 

Modified: branches/basic/general/sysutils/logrotate.xml
==============================================================================
--- trunk/BOOK/general/sysutils/logrotate.xml   Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/sysutils/logrotate.xml       Tue Sep 18 15:03:52 
2018        (r20509)
@@ -81,12 +81,12 @@
     <para role="recommended">
       <xref role="runtime" linkend="fcron"/> (runtime)
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       An <xref role="runtime" linkend="server-mail"/> (runtime)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/logrotate"/>
     </para>

Modified: branches/basic/general/sysutils/pciutils.xml
==============================================================================
--- trunk/BOOK/general/sysutils/pciutils.xml    Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/sysutils/pciutils.xml        Tue Sep 18 15:03:52 
2018        (r20509)
@@ -128,8 +128,8 @@
       updated. To get a current version of this file, run
       <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 <!--<xref 
linkend="curl"/>,
+      <xref linkend="lynx"/>--> 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>.
     </para>
@@ -234,7 +234,7 @@
         <listitem>
           <para>
             fetches the current version of the PCI ID list. Requires
-            <xref linkend="curl"/>, <xref linkend="lynx"/> or
+         <!--   <xref linkend="curl"/>, <xref linkend="lynx"/> or-->
             <xref linkend="wget"/>.
           </para>
           <indexterm zone="pciutils update-pciids">

Modified: branches/basic/general/sysutils/unzip.xml
==============================================================================
--- trunk/BOOK/general/sysutils/unzip.xml       Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/general/sysutils/unzip.xml   Tue Sep 18 15:03:52 2018        
(r20509)
@@ -47,8 +47,9 @@
       apply to this version of <application>UnZip</application>. See the
       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-issues"/> page.</para>
+<!--      <xref linkend="locale-assumed-encoding"/> section of the
+      <xref linkend="locale-issues"/> page.-->
+      </para>
     </caution>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

Modified: branches/basic/index.xml
==============================================================================
--- trunk/BOOK/index.xml        Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/index.xml    Tue Sep 18 15:03:52 2018        (r20509)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; >
-
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY xinclude "http://www.w3.org/2001/XInclude";>
+]>
 <!--
 $LastChangedBy$
 $Date$
@@ -10,30 +11,19 @@
 <book>
 
   <!-- Front Matter -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="book/bookinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="book/dedication.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="book/preface.xml"/>
-
-  <!-- Parts -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="introduction/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="postlfs/postlfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="general/general.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="networking/networking.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="server/server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x/x.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="kde/kde.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gnome/gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xfce/xfce.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="lxde/lxde.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="lxqt/lxqt.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="xsoft/xsoft.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="multimedia/multimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pst/pst.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="book/bookinfo.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="intro.xml"/>
+
+  <!-- Content -->
+  <xi:include xmlns:xi="&xinclude;" href="postlfs/config/config.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="cmdline.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="admin.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="support.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="libraries.xml"/>
 
   <!-- Appendices -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="appendices/creat-comm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="appendices/mit-lic.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="appendices/glossary.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="appendices/creat-comm.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="appendices/mit-lic.xml"/>
 
   <index/>
 

Added: branches/basic/intro.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/intro.xml    Tue Sep 18 15:03:52 2018        (r20509)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="intro">
+  <?dbhtml filename="intro.html"?>
+
+  <title>Introduction</title>
+
+  <xi:include xmlns:xi="&xinclude;" 
href="introduction/important/starting.xml"/>
+  <xi:include xmlns:xi="&xinclude;" 
href="introduction/important/building-notes.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="introduction/important/patches.xml"/>
+  <xi:include xmlns:xi="&xinclude;" 
href="introduction/important/la-files.xml"/>
+
+  <!-- sysv -->
+  <xi:include xmlns:xi="&xinclude;" 
href="introduction/important/bootscripts.xml"/>
+
+  <!-- systemd -->
+  <xi:include xmlns:xi="&xinclude;" 
href="introduction/important/systemd-units.xml"/>
+
+
+</chapter>

Modified: branches/basic/introduction/important/bootscripts.xml
==============================================================================
--- trunk/BOOK/introduction/important/bootscripts.xml   Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/important/bootscripts.xml       Tue Sep 18 
15:03:52 2018        (r20509)
@@ -30,6 +30,11 @@
   <ulink url="&lfs-root;/chapter07/bootscripts.html"/> for more
   information on the LFS-Bootscripts package.</para>
 
+  <note>
+    <para>This section is not applicable if you have built the 
+    systemd version of LFS.</para>
+  </note>
+
   <itemizedlist spacing='compact'>
     <title>Package Information</title>
     <listitem>

Modified: branches/basic/introduction/important/building-notes.xml
==============================================================================
--- trunk/BOOK/introduction/important/building-notes.xml        Wed Sep 12 
16:44:47 2018        (r20497)
+++ branches/basic/introduction/important/building-notes.xml    Tue Sep 18 
15:03:52 2018        (r20509)
@@ -272,7 +272,7 @@
     <para>Notice this results in passing just the press of the
     <keycap>Enter</keycap> key to the script. This is useful for times when the
     default answer to the prompt is sufficient. This syntax is used in the
-    <xref linkend="net-tools-automate-example"/> instructions to accept all the
+    <xref linkend="net-tools-automate-example"/> instructions to accept all 
the 
     defaults to the many prompts during the configuration step. You may now
     remove the test script, if desired.</para>
 

Modified: branches/basic/introduction/important/important.xml
==============================================================================
--- trunk/BOOK/introduction/important/important.xml     Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/important/important.xml Tue Sep 18 15:03:52 
2018        (r20509)
@@ -22,8 +22,9 @@
   <!-- Moved to LFS
      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pkgmgt.xml"/>
   -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="starting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="building-notes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="position.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="position.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="patches.xml"/>
 
   <!-- sysv only -->
@@ -33,8 +34,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="systemd-units.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="la-files.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libraries.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="locale-issues.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="beyond.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="libraries.xml"/>-->
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="locale-issues.xml"/>-->
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="beyond.xml"/>-->
 
 </chapter>

Modified: branches/basic/introduction/important/la-files.xml
==============================================================================
--- trunk/BOOK/introduction/important/la-files.xml      Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/important/la-files.xml  Tue Sep 18 15:03:52 
2018        (r20509)
@@ -58,13 +58,13 @@
     </para>
 
     <para>
-
        The solution is to remove the .la files.  However there is a catch.
-       Some packages, such as <xref linkend='imagemagick'/>, use a libtool
+       <!--Some packages, such as <xref linkend='imagemagick'/>, use a 
libtool-->
+       Some packages, such as <ulink url='&blfs-book;general/imagemagick.html'>
+       ImageMagick</ulink>, use a libtool
        function, lt_dlopen, to load libraries as needed during execution and
        resolve their dependencies at run time.  In this case, the .la files
        should remain. 
-    
     </para>
 
     <para>

Modified: branches/basic/introduction/important/libraries.xml
==============================================================================
--- trunk/BOOK/introduction/important/libraries.xml     Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/important/libraries.xml Tue Sep 18 15:03:52 
2018        (r20509)
@@ -95,7 +95,7 @@
     standalone library. These internal libraries are not a problem - if the
     package has to be rebuilt to fix a bug or vulnerability, nothing else is
     linked to them.</para>
-
+<!--
     <para>When BLFS mentions system libraries, it means shared versions of
     libraries. Some packages such as <xref linkend="firefox"/> and
     <xref linkend="gs"/> include many other libraries. When they link to them,
@@ -114,7 +114,7 @@
     package&apos;s upstream and you have no other packages which will use it.
     In those cases, you might decide to use the included static library even if
     you usually prefer to use system libraries.</para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libraries"/></para>
 

Modified: branches/basic/introduction/important/systemd-units.xml
==============================================================================
--- trunk/BOOK/introduction/important/systemd-units.xml Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/important/systemd-units.xml     Tue Sep 18 
15:03:52 2018        (r20509)
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="systemd-units" 
xreflabel="blfs-systemd-units-&systemd-units-version;" revision="systemd">
+<sect1 id="systemd-units" 
xreflabel="blfs-systemd-units-&systemd-units-version;">
   <?dbhtml filename="systemd-units.html"?>
 
   <sect1info>
@@ -28,6 +28,11 @@
     that are used throughout the book.
   </para>
 
+  <note>
+    <para>This section is not applicable if you have built the System V 
+    version of LFS.</para>
+  </note>
+
   <itemizedlist spacing="compact">
     <title>Package Information</title>
     <listitem>

Modified: branches/basic/introduction/introduction.xml
==============================================================================
--- trunk/BOOK/introduction/introduction.xml    Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/introduction/introduction.xml        Tue Sep 18 15:03:52 
2018        (r20509)
@@ -10,12 +10,12 @@
 $Date$
 -->
 
-<part id="introduction" xreflabel="Introduction">
+<!-- <part id="introduction" xreflabel="Introduction">
   <?dbhtml filename="introduction.html" dir="introduction"?>
 
-  <title>Introduction</title>
+  <title>Introduction</title>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="welcome/welcome.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="important/important.xml"/>
 
-</part>
+<!--</part>-->

Modified: branches/basic/introduction/welcome/conventions.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/conventions.xml     Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/introduction/welcome/conventions.xml Tue Sep 18 15:03:52 
2018        (r20509)
@@ -52,7 +52,7 @@
     the book such as HowTos, download locations, websites, etc.</para>
   </blockquote>
 
-  <para><xref linkend="seamonkey"/></para>
+  <!--<para><xref linkend="seamonkey"/></para>-->
 
   <blockquote>
     <para>This form of text is used for links internal to

Modified: branches/basic/introduction/welcome/welcome.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/welcome.xml Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/introduction/welcome/welcome.xml     Tue Sep 18 15:03:52 
2018        (r20509)
@@ -17,24 +17,24 @@
 
   <para>The Beyond Linux From Scratch book is designed to carry on from where
   the LFS book leaves off. But unlike the LFS book, it isn't designed to be
-  followed straight through.  Reading the <xref linkend="whichsections"/>
-  part of this chapter should help guide you through the book.</para>
+  followed straight through. <!-- Reading the <xref linkend="whichsections"/>
+  part of this chapter should help guide you through the book.--></para>
 
   <para>Please read most of this part of the book carefully as it explains
   quite a few of the conventions used throughout the book.</para>
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="acknowledgments.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="which.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="which.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="conventions.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="version.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="version.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mirrors.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="packages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="changelog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="maillists.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wiki.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wiki.xml"/> -->
   <!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="newsserver.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="askhelp.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="askhelp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="credits.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="contact.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="contact.xml"/>-->
 
 </chapter>

Added: branches/basic/libraries.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/libraries.xml        Tue Sep 18 15:03:52 2018        (r20509)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+
+  <!ENTITY xinclude "http://www.w3.org/2001/XInclude";>
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="libraries" xreflabel="libraries">
+  <?dbhtml filename="libraries.html"?>
+
+  <title>Libraries</title>
+
+  <para>These libraries support programs in this book.</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="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/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="Python Mpdules">
+    <title>Python Mpdules</title>
+    <xi:include xmlns:xi="&xinclude;" href="general/prog/six.xml"/>
+  </sect1>
+
+<!--
+ LWP::Protocol::https-6.07 (Perl Module)
+-->
+
+
+</chapter>

Added: branches/basic/lwp-protocol-https.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/lwp-protocol-https.xml       Tue Sep 18 15:03:52 2018        
(r20509)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+
+  <!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">
+]>
+
+<sect1 id="lwp-protocol-https" xreflabel="LWP::Protocol::https">
+  <?dbhtml filename="lwp-protocol-https.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Perl Modules</title>
+
+  <sect2 role="package">
+    <title>Introduction to Perl Module LWP::Protocol::https</title>
+
+
+    <!-- LWP::Protocol::https -->
+    <bridgehead renderas="sect3" id="perl-lwp-protocol-https"
+    xreflabel="LWP::Protocol::https-&LWP-Protocol-https-version;">
+    LWP::Protocol::https-&LWP-Protocol-https-version;</bridgehead>
+
+    <indexterm zone="lwp-protocol-https perl-lwp-protocol-https">
+      <primary sortas="a-LWP-Protocol-https">LWP::Protocol::https</primary>
+    </indexterm>
+
+    <para>LWP::Protocol::https provides https support for
+    LWP::UserAgent (i.e. for LWP). This module uses 
+    <xref linkend="perl-auto-install"/>.</para>
+
+  </sect2>
+
+  <sect2 role="installation" id="perl-auto-install"
+  xreflabel="auto installation instructions">
+    <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>
+
+    <para>The first time you run <command>cpan</command>, you'll be prompted
+    to enter some information regarding download locations and methods. This
+    information is retained in files located in
+    <filename class='directory'>~/.cpan</filename>. Start the
+    <command>cpan</command> shell by issuing '<command>cpan</command>' as the
+    <systemitem class="username">root</systemitem> user. Any module may now be
+    installed from the
+    <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
+    prompt with the command:</para>
+
+<screen role="root"><userinput>install 
<replaceable>&lt;Module::Name&gt;</replaceable></userinput></screen>
+
+    <para>For additional commands and help, issue '<command>help</command>'
+    from the
+    <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
+    prompt.</para>
+
+    <para>Alternatively, for scripted or non-interactive installations, use the
+    following syntax as the
+    <systemitem class="username">root</systemitem> user to install one or more
+    modules:</para>
+
+<screen role="root"><userinput>cpan -i <replaceable>&lt;Module1::Name&gt; 
&lt;Module2::Name&gt;</replaceable></userinput></screen>
+
+    <para>Review the <filename>cpan.1</filename> man page for additional
+    parameters you can pass to <command>cpan</command> on the command
+    line.</para>
+
+  </sect2>
+
+</sect1>

Modified: branches/basic/networking/connect/dhcpcd.xml
==============================================================================
--- trunk/BOOK/networking/connect/dhcpcd.xml    Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/connect/dhcpcd.xml        Tue Sep 18 15:03:52 
2018        (r20509)
@@ -60,12 +60,12 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">dhcpcd Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="llvm"/> (with Clang)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/dhcpcd"/></para>
 

Modified: branches/basic/networking/mailnews/mailx.xml
==============================================================================
--- trunk/BOOK/networking/mailnews/mailx.xml    Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/mailnews/mailx.xml        Tue Sep 18 15:03:52 
2018        (r20509)
@@ -74,7 +74,7 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">Heirloom mailx Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openssl10"/> or
     <xref linkend="nss"/>,
@@ -84,7 +84,7 @@
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/mailx"/></para>
-
+-->
   </sect2>
 
   <sect2 role="installation">

Modified: branches/basic/networking/netlibs/libtirpc.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/libtirpc.xml  Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/netlibs/libtirpc.xml      Tue Sep 18 15:03:52 
2018        (r20509)
@@ -73,12 +73,12 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="mitkrb"/> for the GSSAPI
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libtirpc"/>
     </para>
@@ -86,20 +86,11 @@
 
   <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>
-<!--  Looks like this is incorporated in version 1.0.3
-    <para>
-      Fix a symbol name needed by NIS libraries:
-    </para>
-
-<screen><userinput>sed '/key_secret_is/s/secret/secretkey/' -i 
src/libtirpc.map</userinput></screen>
-    <para>
-      Install <application>libtirpc</application> by running the following
-      commands:
-    </para>
 -->
+
 <screen><userinput>./configure --prefix=/usr                                   
\
             --sysconfdir=/etc                               \
             --disable-static                                \
@@ -125,13 +116,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
+      <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.
     </para>
-
+-->
     <para>
       <command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared
       libraries into /lib so they are available before /usr is mounted.

Modified: branches/basic/networking/netprogs/ntp.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/ntp.xml      Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/netprogs/ntp.xml  Tue Sep 18 15:03:52 2018        
(r20509)
@@ -77,8 +77,8 @@
 -->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libevent"/>, 
+<!--      <xref linkend="libcap-pam"/>,
+      <xref linkend="libevent"/>, -->
       <ulink url="http://www.thrysoee.dk/editline/";>libedit</ulink>, and
       <ulink url="https://www.gnu.org/software/autogen/";>libopts from 
AutoGen</ulink>
     </para>

Modified: branches/basic/networking/netprogs/rsync.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/rsync.xml    Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/netprogs/rsync.xml        Tue Sep 18 15:03:52 
2018        (r20509)
@@ -88,10 +88,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
     build HTML API documentation, issue <command>doxygen</command>.</para>
-
+-->
     <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>

Modified: branches/basic/networking/netprogs/wget.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wget.xml     Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/netprogs/wget.xml Tue Sep 18 15:03:52 2018        
(r20509)
@@ -78,7 +78,7 @@
     <para role="recommended">
       <xref role="runtime" linkend="make-ca"/> (runtime)
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="gnutls"/>,
@@ -91,7 +91,7 @@
       <xref linkend="python2"/> (built with ssl; for the test suite), and
       <xref linkend="valgrind"/> (for the test suite)
     </para>
-
+-->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/wget"/>
     </para>
@@ -132,7 +132,7 @@
 
     <para>
       <parameter>--with-ssl=openssl</parameter>: This allows the program to use
-      openssl instead of <xref linkend="gnutls"/>.
+      openssl instead of <!--<xref linkend="gnutls"/>. -->
     </para>
 
     <para>

Modified: branches/basic/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wpa_supplicant.xml   Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/networking/netprogs/wpa_supplicant.xml       Tue Sep 18 
15:03:52 2018        (r20509)
@@ -92,14 +92,14 @@
     <para role="recommended">
       <xref linkend="libnl"/> 
     </para>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="dbus"/>,
       <xref linkend="libxml2"/>, and
       <xref linkend="qt5"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/wpa_supplicant"/>
     </para>
@@ -174,7 +174,7 @@
 CONFIG_WPS=y
 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
@@ -182,7 +182,7 @@
       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
 CONFIG_CTRL_IFACE_DBUS_NEW=y
@@ -197,7 +197,7 @@
 <screen><userinput>patch -p1 -i 
../wpa_supplicant-&wpa_supplicant-version;-upstream_fixes-2.patch &amp;&amp;
 cd wpa_supplicant                                         &amp;&amp;
 make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
-
+<!--
     <para>
       If you have installed <xref linkend="qt5"/> and wish to build
       the <application>WPA Supplicant</application> GUI program, run
@@ -206,7 +206,7 @@
 
     <note><para>The following directory name is labelled qt4, but 
     is compatible with <xref linkend="qt5"/>.</para></note>
-
+-->
 <screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
 qmake wpa_gui.pro &amp;&amp;
 make &amp;&amp;
@@ -275,10 +275,10 @@
         <application>D-Bus</application> interface.
       </para>
     </note>
-
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/update-desktop-database.xml"/>
-
+-->
   </sect2>
 
   <sect2 role="configuration">
@@ -388,7 +388,7 @@
 
       <para revision="sysv">
         If your router/access point uses DHCP to allocate IP addresses, you
-        can install <xref linkend="dhcp"/> client and use it to
+        can install<!-- <xref linkend="dhcp"/> -->client and use it to
         automatically obtain network addresses. Create the
         <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
         </filename> by running the following command as the
@@ -418,7 +418,7 @@
 
       <para revision="sysv">
         If you prefer <xref linkend="dhcpcd"/> instead of
-        <xref linkend="dhcp"/> client, then create the
+<!--        <xref linkend="dhcp"/>--> client, then create the
         <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
         </filename> by running the following command as the
         <systemitem class="username">root</systemitem> user:

Modified: branches/basic/networking/netutils/bind-utils.xml
==============================================================================
--- trunk/BOOK/networking/netutils/bind-utils.xml       Wed Sep 12 16:44:47 
2018        (r20497)
+++ branches/basic/networking/netutils/bind-utils.xml   Tue Sep 18 15:03:52 
2018        (r20509)
@@ -31,7 +31,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 <!--<xref linkend="bind"/>-->. The <application>BIND</application>
     package includes the client side programs <command>nslookup</command>,
     <command>dig</command> and <command>host</command>. If you install
     <application>BIND</application> server, these programs will be installed
@@ -64,13 +64,13 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">BIND Utilities Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="libcap-pam"/> and
       <xref linkend="libxml2"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/bind-utils"/></para>
 
@@ -126,7 +126,7 @@
 
     <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 
-    <para>See the program descriptions in the <xref linkend="bind"/>
+    <para>See the program descriptions in the <!-- <xref linkend="bind"/> -->
     section.</para>
 
   </sect2>

Modified: branches/basic/networking/textweb/links.xml
==============================================================================
--- trunk/BOOK/networking/textweb/links.xml     Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/networking/textweb/links.xml Tue Sep 18 15:03:52 2018        
(r20509)
@@ -63,6 +63,7 @@
     <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
     <xref linkend="gpm"/> (mouse support to be used with a framebuffer-based 
console),
@@ -79,7 +80,7 @@
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/LinksBrowser"/></para>
-
+-->
   </sect2>
 
   <sect2 role="installation">

Modified: branches/basic/postlfs/config/bootdisk.xml
==============================================================================
--- trunk/BOOK/postlfs/config/bootdisk.xml      Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/config/bootdisk.xml  Tue Sep 18 15:03:52 2018        
(r20509)
@@ -35,7 +35,7 @@
     <para>Building a complete rescue device is a challenging task.  In many
     ways, it is equivalent to building an entire LFS system.
     In addition, it would be a repetition of information already available.
-    For these reasons, the procedures for a rescue device image are not
+    For these reasons, the procedures for creating a rescue device image are 
not
     presented here.</para>
 
   </sect2>
@@ -64,8 +64,9 @@
     <ulink url='http://www.&lfs-domainname;/livecd/'/>.  This LiveCD, is no
     longer capable of building an entire LFS/BLFS system, but is still a
     good rescue CD-ROM.  If you download the
-    ISO image, use <xref linkend="xorriso"/> to copy the image to a
-    CD-ROM.</para>
+<!--    ISO image, use <xref linkend="xorriso"/> to copy the image to a-->
+    ISO image, use <ulink 
url="&blfs-book;multimedia/libisoburn.html">xorriso</ulink> 
+    to copy the image to a CD-ROM.</para>
 
     <para>The instructions for using GRUB2 to make a custom rescue CD-ROM are
     also available in <ulink
@@ -77,7 +78,7 @@
   <sect2>
     <title>Creating a Bootable USB Drive</title>
 
-    <para>A USB Pen drive, sometimes called a Thumb drive, is recognized by 
Linux as
+    <para>A USB pen drive, sometimes called a thumb drive, is recognized by 
Linux as
     a SCSI device.  Using one of these devices as a rescue device has the 
advantage
     that it is usually large enough to hold more than a minimal boot image.  
You
     can save critical data to the drive as well as use it to diagnose and 
recover
@@ -85,6 +86,13 @@
     system consists of formatting the drive, adding 
<application>GRUB</application>
     as well as the Linux kernel and supporting files.</para>
 
+    <para>Creating a bootable USB drive from a downloaded iso file is
+    relatively simple. For example, if the iso file is some-rescue.iso and when
+    inserting a usb drive into the system the drive is recognized as /dev/sdg,
+    the file can be copied to the drive (as the root user) with:</para>
+
+<screen><userinput>dd of=/dev/sdg bs=8M status=progress oflag=direct 
if=some-rescue.iso</userinput></screen>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/CreatingaCustomBootDevice'/></para>
 

Modified: branches/basic/postlfs/config/config.xml
==============================================================================
--- trunk/BOOK/postlfs/config/config.xml        Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/config/config.xml    Tue Sep 18 15:03:52 2018        
(r20509)
@@ -39,24 +39,25 @@
   topics&mdash;<xref linkend="postlfs-config-profile"/> and
   <xref linkend="postlfs-config-vimrc"/>.</para>
 
-  <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
+<!--  <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
   <phrase revision="sysv"><xref linkend="postlfs-config-random"/>,</phrase>
   and <xref linkend="autofs"/> are then addressed, in that order. They
-  don't have much interaction with the other topics in this chapter.</para>
+  don't have much interaction with the other topics in this chapter.</para> -->
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="bootdisk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="console-fonts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="firmware.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="skel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="users.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="vimrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="logon.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="bootdisk.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="console-fonts.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="firmware.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="../filesystems/initramfs.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="devices.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="skel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="users.xml"/>-->
+  <xi:include xmlns:xi="&xinclude;" href="profile.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="vimrc.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="logon.xml"/>-->
 
   <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="random.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="random.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="lsb-release.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="lsb-release.xml"/>-->
 
 </chapter>

Modified: branches/basic/postlfs/config/console-fonts.xml
==============================================================================
--- trunk/BOOK/postlfs/config/console-fonts.xml Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/config/console-fonts.xml     Tue Sep 18 15:03:52 
2018        (r20509)
@@ -21,7 +21,9 @@
 
   <para>
     An LFS system can be used without a graphical desktop, and unless or until
-    you install <xref linkend="x-window-system"/> you will have to work in the
+<!--    you install <xref linkend="x-window-system"/> you will have to work in 
the-->
+    you install <ulink url="&blfs-book;x/installing.html">the X Window 
System</ulink> 
+    you will have to work in the
     console. Most, if not all, PCs boot with an 8x16 font - whatever the actual
     screen size. There are a few things you can do to alter the display on the
     console. Most of them involve changing the font, but the first alters the
@@ -52,10 +54,12 @@
       'video=' parameter between the 'root=/dev/sdXn' and 'ro', for example
       <literal>root=/dev/sda2 video=1024x768 ro</literal> based on the
       example in LFS section 8.4.4 :
-      <phrase revision="sysv">
+      <!--<phrase revision="sysv">
       <ulink url="&lfs-root;/chapter08/grub.html"/></phrase>
-      <phrase revision="systemd">
-      <ulink url="&lfs-rootd;/chapter08/grub.html"/></phrase>.
+      <ulink url="&lfs-root;/chapter08/grub.html"/></phrase>-->
+      <ulink url="&lfs-webroot;lfs/view/stable/chapter08/grub.html"/>
+      <!--<phrase revision="systemd">
+      <ulink url="&lfs-rootd;/chapter08/grub.html"/></phrase>.-->
     </para>
 
     <para>
@@ -90,7 +94,7 @@
       to 256 characters (technically, glyphs) while allowing 16 colours, or up
       to 512 characters (in which  case, the bright colours will not be
       available). Clearly, these console fonts cannot be used to display CJK
-      text - that would need thousands of available glyphs.
+      text &mdash; that would need thousands of available glyphs.
     </para>
 
     <para>
@@ -153,14 +157,24 @@
     <para>
       When you find a font which to wish to use, as the
       <systemitem class="username">root</systemitem> user) edit
+      the appropriate configururation file.  
+      
+      If your version of LFS is 
+      System V based, see LFS section 7.6.5 at
+      <ulink url="&lfs-webroot;lfs/view/stable/chapter07/usage.html"/>.
+      
+      If your version of LFS is 
+      systemd based, see LFS section 7.6 at
+      <ulink 
url="&lfs-webroot;lfs/view/stable-systemd/chapter07/console.html"/>.
+      <!--
       <phrase revision="sysv">
-      <filename>/etc/sysconfig/console</filename> as described in
       LFS section 7.6.5
       <ulink url="&lfs-root;/chapter07/usage.html"/>.</phrase>
       <phrase revision="systemd">
       <filename>/etc/vconsole.conf</filename> as described in
       LFS section 7.6
       <ulink url="&lfs-rootd;/chapter07/console.html"/>.</phrase>.
+      -->
     </para>
 
     <para>
@@ -217,7 +231,7 @@
     <para>
       By default <application>terminus-fonts</application> will try to create
       several types of font, and it will fail if <command>bdftopcf</command>
-      from <xref linkend="xorg7-app"/> has not been installed. The configure
+      from <!--<xref linkend="xorg7-app"/>--> has not been installed. The 
configure
       script is only really useful if you go on to install
       <emphasis>all</emphasis> the fonts (console and X11 bitmap) to the
       correct directories, as in a distro. To build only the PSF fonts and

Modified: branches/basic/postlfs/config/devices.xml
==============================================================================
--- trunk/BOOK/postlfs/config/devices.xml       Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/config/devices.xml   Tue Sep 18 15:03:52 2018        
(r20509)
@@ -125,7 +125,8 @@
 
     <note><para>The above line is used for descriptive purposes only. The
     scanner <application>udev</application> rules are put into place when
-    installing <xref linkend='sane'/>.</para></note>
+<!--    installing <xref linkend='sane'/>.</para></note>-->
+    installing  <ulink 
url='&blfs-book;/pst/sane.html'>sane</ulink>.</para></note>
 
   </sect2>
 

Modified: branches/basic/postlfs/config/firmware.xml
==============================================================================
--- trunk/BOOK/postlfs/config/firmware.xml      Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/config/firmware.xml  Tue Sep 18 15:03:52 2018        
(r20509)
@@ -79,9 +79,11 @@
   tools may be useful for determining, obtaining, or preparing the needed
   firmware in order to load it into the system:
     <xref linkend="cpio"/>,
-    <xref linkend="git"/>,
-    <xref linkend="pciutils"/>, and
-    <xref linkend="wget"/></para></note>
+    <xref linkend="pciutils"/>, 
+    <xref linkend="wget"/>, and
+  <!--  <xref linkend="git"/>, -->
+    <ulink url="&blfs-book;/general/git.html">git</ulink>
+    </para></note>
 
   <para condition="html" role="usernotes">User Notes:
   <ulink url="&blfs-wiki;/aboutfirmware"/></para>
@@ -374,8 +376,8 @@
 cp -v &lt;YOUR_BLOBS&gt; /lib/firmware/radeon</userinput></screen>
 
     <para>There are actually two ways of installing this firmware. BLFS, in the
-    'Kernel Configuration for additional firmware' section part of the <xref
-    linkend="xorg-ati-driver"/> section  gives an example of compiling the
+    'Kernel Configuration for additional firmware' section part of the 
<!--<xref
+    linkend="xorg-ati-driver"/>--> section  gives an example of compiling the
     firmware into the kernel - that is slightly faster to load, but uses more
     kernel memory. Here we will use the alternative method of making the radeon
     driver a module. In your kernel config set the following: </para>

Modified: branches/basic/postlfs/filesystems/parted.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/parted.xml   Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/filesystems/parted.xml       Tue Sep 18 15:03:52 
2018        (r20509)
@@ -69,7 +69,7 @@
       </itemizedlist>
 
     <bridgehead renderas="sect3">Parted Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="lvm2"/> (device-mapper, required if building
@@ -81,7 +81,7 @@
       <xref linkend="pth"/> and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
-
+-->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/parted"/>
     </para>
@@ -110,8 +110,10 @@
 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;
 texi2dvi             -o doc/parted.dvi doc/parted.texi &amp;&amp;

Modified: branches/basic/postlfs/postlfs.xml
==============================================================================
--- trunk/BOOK/postlfs/postlfs.xml      Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/postlfs/postlfs.xml  Tue Sep 18 15:03:52 2018        (r20509)
@@ -10,16 +10,16 @@
 $Date$
 -->
 
-<part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
+<!--<part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
   <?dbhtml filename="postlfs.html" dir="postlfs"?>
 
-  <title>Post LFS Configuration and Extra Software</title>
+  <title>Post LFS Configuration and Extra Software</title>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="config/config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="security/security.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="security/security.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="filesystems/filesystems.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="editors/editors.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="shells/shells.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="virtualization/virtualization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="virtualization/virtualization.xml"/>-->
 
 </part>

Modified: branches/basic/postlfs/security/make-ca.xml
==============================================================================
--- trunk/BOOK/postlfs/security/make-ca.xml     Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/security/make-ca.xml Tue Sep 18 15:03:52 2018        
(r20509)
@@ -74,7 +74,7 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">make-ca Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="p11-kit"/> (required at runtime to
     generate certificate stores from trust anchors)</para>
@@ -86,7 +86,7 @@
       store), and <xref role="runtime" linkend="nss"/> (to generate a shared
       NSSDB)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/make-ca'/></para>
   </sect2>
@@ -96,7 +96,7 @@
 
     <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
     on the system). Any local certificates stored in
@@ -145,7 +145,7 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
    <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>
 
     <note>
@@ -170,7 +170,7 @@
     systems. There are, however, several other variants of the file available
     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 <!--<xref linkend="nss"/>-->. 
Additional
     upstream downloads are available at the links below.</para>
 
     <itemizedlist spacing="compact">

Modified: branches/basic/postlfs/security/openssh.xml
==============================================================================
--- trunk/BOOK/postlfs/security/openssh.xml     Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/security/openssh.xml Tue Sep 18 15:03:52 2018        
(r20509)
@@ -92,6 +92,7 @@
       <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"/>,
@@ -109,7 +110,7 @@
       <xref role="runtime" linkend="net-tools"/>, and
       <xref role="runtime" linkend="sysstat"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">
         User Notes: <ulink url="&blfs-wiki;/OpenSSH"/>
     </para>

Modified: branches/basic/postlfs/security/p11-kit.xml
==============================================================================
--- trunk/BOOK/postlfs/security/p11-kit.xml     Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/security/p11-kit.xml Tue Sep 18 15:03:52 2018        
(r20509)
@@ -80,9 +80,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="make-ca"/> (runtime), 
-      <xref linkend="nss"/> (runtime),
+   <!--   <xref linkend="nss"/> (runtime),
       <xref linkend="gtk-doc"/> and
-      <xref linkend="libxslt"/>
+      <xref linkend="libxslt"/>-->
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -132,7 +132,7 @@
 
     <para>
       <option>--enable-doc</option>: Use this switch if you have installed
-      <xref linkend="gtk-doc"/> and <xref linkend="libxslt"/> and wish to
+ <!--     <xref linkend="gtk-doc"/> and <xref linkend="libxslt"/> -->and wish 
to
       rebuild the documentation and generate manual pages.
     </para>
 

Modified: branches/basic/postlfs/security/sudo.xml
==============================================================================
--- trunk/BOOK/postlfs/security/sudo.xml        Wed Sep 12 16:44:47 2018        
(r20497)
+++ branches/basic/postlfs/security/sudo.xml    Tue Sep 18 15:03:52 2018        
(r20509)
@@ -74,7 +74,7 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">Sudo Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="linux-pam"/>,
@@ -85,8 +85,8 @@
       <ulink url="http://www.openafs.org/";>AFS</ulink>,
       <ulink url="http://www.fwtk.org/";>FWTK</ulink>, and
       <ulink url="&sourceforge-dl;/opie/">Opie</ulink>
-<!--  <ulink url="http://www.rsa.com/node.aspx?id=1156";>SecurID</ulink>-->
     </para>
+-->
 
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/sudo"/>

Modified: branches/basic/server/databases/db.xml
==============================================================================
--- trunk/BOOK/server/databases/db.xml  Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/server/databases/db.xml      Tue Sep 18 15:03:52 2018        
(r20509)
@@ -71,18 +71,18 @@
     </itemizedlist>
 
     <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)
-
+-->
       <!--,
       <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>
+<!--    </para> -->
 
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/db"/>

Modified: branches/basic/server/mail/postfix.xml
==============================================================================
--- trunk/BOOK/server/mail/postfix.xml  Wed Sep 12 16:44:47 2018        (r20497)
+++ branches/basic/server/mail/postfix.xml      Tue Sep 18 15:03:52 2018        
(r20509)
@@ -78,10 +78,10 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="db"/>,
-      <xref linkend="cyrus-sasl"/>, and
+      <!--<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,
@@ -93,7 +93,7 @@
       <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>,
       <application>MySQL</application>, <application>PostgreSQL</application>

Added: branches/basic/support.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ branches/basic/support.xml  Tue Sep 18 15:03:52 2018        (r20509)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "general.ent">
+  %general-entities;
+
+  <!ENTITY xinclude "http://www.w3.org/2001/XInclude";>
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="support" xreflabel="Support Tools">
+  <?dbhtml filename="support.html"?>
+
+  <title>Support Tools</title>
+
+  <para>These programs are used by other programs.</para>
+
+  <xi:include xmlns:xi="&xinclude;" href="general/prog/python2.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="general/sysutils/cpio.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="postlfs/filesystems/parted.xml"/>
+  <xi:include xmlns:xi="&xinclude;" href="server/databases/db.xml"/>
+
+
+<!--
+cpio-2.12 (for building initrd)
+ parted-3.2 (for partprobe)
+ Berkeley DB-5.3.28
+
+
+-->
+
+</chapter>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to