Index: networking/netprogs/cifsutils-systemd.xml
===================================================================
--- networking/netprogs/cifsutils-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/cifsutils-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,222 @@
+<?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 cifsutils-download-http "http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
+  <!ENTITY cifsutils-download-ftp  "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
+  <!ENTITY cifsutils-md5sum        "b7d75b67fd3987952896d27256c7293d">
+  <!ENTITY cifsutils-size          "384 KB">
+  <!ENTITY cifsutils-buildsize     "3.1 MB">
+  <!ENTITY cifsutils-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="cifsutils" xreflabel="cifs-utils-&cifsutils-version;">
+  <?dbhtml filename="cifsutils.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>cifs-utils-&cifsutils-version;</title>
+
+  <indexterm zone="cifsutils">
+    <primary sortas="a-cifsutils">cifs-utils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+   <title>Introduction to cifs-utils</title>
+
+    <para>The <application>cifs-utils</application> provides a means for
+    mounting SMB/CIFS shares on a Linux system.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cifsutils-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cifsutils-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cifsutils-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cifsutils-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &cifsutils-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &cifsutils-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">cifs-utils Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="keyutils"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="talloc"/>,
+      <xref linkend="samba"/>, and
+      <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cifsutils"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id="cifsutils-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary:
+    </para>
+
+<screen><literal>File systems  ---&gt;
+  Network File Systems  ---&gt;
+    CIFS support (advanced network filesystem, SMBFS successor): Y or M [CONFIG_CIFS]</literal></screen>
+
+    <indexterm zone="cifsutils cifsutils-kernel">
+      <primary sortas="d-cifsutils">cifs-utils</primary>
+    </indexterm>
+                                                                                                                                       
+  </sect2>                                                                                                                             
+
+  <sect2 role="installation">
+    <title>Installation of cifs-utils</title>
+
+    <para>Install <application>cifs-utils</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --disable-pam &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+      <title>Command Explanations</title>
+
+          <para>
+            <parameter>--disable-pam</parameter>: This switch disables
+            PAM support. Replace it with
+            <option>--with-pamdir=/lib/security</option>,
+            if <xref linkend="linux-pam"/> is installed and you wish
+            to build the PAM module.
+          </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg> getcifsacl, mount.cifs and setcifsacl;
+          optional: cifs.idmap, cifs.upcall and cifscreds</seg>
+        <seg>/usr/lib/cifs-utils/idmapwb.so and optionally
+          PAM module /lib/security/pam_cifscreds.so</seg>
+        <seg>/usr/lib/cifs-utils</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cifs.idmap">
+        <term><command>cifs.idmap</command></term>
+        <listitem>
+          <para>is a userspace helper program for the linux CIFS client
+          filesystem. There are a number of activities that the kernel cannot
+          easily do itself. This program is a callout program that does these
+          things for the kernel and then returns the result. It is not intended
+          to be run from the command-line.</para>
+          <indexterm zone="cifsutils cifs.idmap">
+            <primary sortas="b-cifs.idmap">cifs.idmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cifs.upcall">
+        <term><command>cifs.upcall</command></term>
+        <listitem>
+          <para>is a userspace helper program for the linux CIFS client
+          filesystem. It is intended to be run when the kernel calls
+          request-key for a particular key type.  It is not intended to be
+          run from the command-line.</para>
+          <indexterm zone="cifsutils cifs.upcall">
+            <primary sortas="b-cifs.upcall">cifs.upcall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cifscreds">
+        <term><command>cifscreds</command></term>
+        <listitem>
+          <para>is a tool for managing credentials (username and password)
+          for the purpose of establishing sessions in multiuser mounts.</para>
+          <indexterm zone="cifsutils cifscreds">
+            <primary sortas="b-cifscreds">cifscreds</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getcifsacl">
+        <term><command>getcifsacl</command></term>
+        <listitem>
+          <para>is a userspace helper  to display an ACL in a security
+          descriptor for Common Internet File System (CIFS).</para>
+          <indexterm zone="cifsutils getcifsacl">
+            <primary sortas="b-getcifsacl">getcifsacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount.cifs">
+        <term><command>mount.cifs</command></term>
+        <listitem>
+          <para>mounts a Linux CIFS filesystem. It is usually invoked
+          indirectly by the mount(8) command when using the "-t cifs" option.
+          </para>
+          <indexterm zone="cifsutils mount.cifs">
+            <primary sortas="b-mount.cifs">mount.cifs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setcifsacl">
+        <term><command>setcifsacl</command></term>
+        <listitem>
+          <para>is intended to alter an ACL of a security descriptor for a file
+          system object.</para>
+          <indexterm zone="cifsutils setcifsacl">
+            <primary sortas="b-setcifsacl">setcifsacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?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 cifsutils-download-http "http://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
-  <!ENTITY cifsutils-download-ftp  "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
-  <!ENTITY cifsutils-md5sum        "b7d75b67fd3987952896d27256c7293d">
-  <!ENTITY cifsutils-size          "384 KB">
-  <!ENTITY cifsutils-buildsize     "3.1 MB">
-  <!ENTITY cifsutils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="cifsutils" xreflabel="cifs-utils-&cifsutils-version;">
-  <?dbhtml filename="cifsutils.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>cifs-utils-&cifsutils-version;</title>
-
-  <indexterm zone="cifsutils">
-    <primary sortas="a-cifsutils">cifs-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-   <title>Introduction to cifs-utils</title>
-
-    <para>The <application>cifs-utils</application> provides a means for
-    mounting SMB/CIFS shares on a Linux system.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cifsutils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cifsutils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cifsutils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cifsutils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cifsutils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cifsutils-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cifs-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="keyutils"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="talloc"/>,
-      <xref linkend="samba"/>, and
-      <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink> or
-      <xref linkend="libcap-pam"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cifsutils"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="cifsutils-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>File systems  ---&gt;
-  Network File Systems  ---&gt;
-    CIFS support (advanced network filesystem, SMBFS successor): Y or M [CONFIG_CIFS]</literal></screen>
-
-    <indexterm zone="cifsutils cifsutils-kernel">
-      <primary sortas="d-cifsutils">cifs-utils</primary>
-    </indexterm>
-                                                                                                                                       
-  </sect2>                                                                                                                             
-
-  <sect2 role="installation">
-    <title>Installation of cifs-utils</title>
-
-    <para>Install <application>cifs-utils</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-pam \
-            --disable-systemd &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-      <title>Command Explanations</title>
-
-          <para><parameter>--disable-pam</parameter>: Do not build PAM support.
-            Remove  it and use <option>--with-pamdir</option> (see below),
-            if <xref linkend="linux-pam"/> is installed and you wish
-            PAM support.</para>
-
-          <para><parameter>--disable-systemd</parameter>: Disable systemd
-            specific behavior for <command>mount.cifs</command>. Remove it for
-            systems running with systemd.</para>
-
-          <para><option>--with-pamdir=/lib/security</option>: Install the PAM
-            module in
-            <filename class="directory">/lib/security</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg> getcifsacl, mount.cifs and setcifsacl;
-          optional: cifs.idmap, cifs.upcall and cifscreds</seg>
-        <seg>/usr/lib/cifs-utils/idmapwb.so and optionally
-          PAM module /lib/security/pam_cifscreds.so</seg>
-        <seg>/usr/lib/cifs-utils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifs.idmap">
-        <term><command>cifs.idmap</command></term>
-        <listitem>
-          <para>is a userspace helper program for the linux CIFS client
-          filesystem. There are a number of activities that the kernel cannot
-          easily do itself. This program is a callout program that does these
-          things for the kernel and then returns the result. It is not intended
-          to be run from the command-line.</para>
-          <indexterm zone="cifsutils cifs.idmap">
-            <primary sortas="b-cifs.idmap">cifs.idmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cifs.upcall">
-        <term><command>cifs.upcall</command></term>
-        <listitem>
-          <para>is a userspace helper program for the linux CIFS client
-          filesystem. It is intended to be run when the kernel calls
-          request-key for a particular key type.  It is not intended to be
-          run from the command-line.</para>
-          <indexterm zone="cifsutils cifs.upcall">
-            <primary sortas="b-cifs.upcall">cifs.upcall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cifscreds">
-        <term><command>cifscreds</command></term>
-        <listitem>
-          <para>is a tool for managing credentials (username and password)
-          for the purpose of establishing sessions in multiuser mounts.</para>
-          <indexterm zone="cifsutils cifscreds">
-            <primary sortas="b-cifscreds">cifscreds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getcifsacl">
-        <term><command>getcifsacl</command></term>
-        <listitem>
-          <para>is a userspace helper  to display an ACL in a security
-          descriptor for Common Internet File System (CIFS).</para>
-          <indexterm zone="cifsutils getcifsacl">
-            <primary sortas="b-getcifsacl">getcifsacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount.cifs">
-        <term><command>mount.cifs</command></term>
-        <listitem>
-          <para>mounts a Linux CIFS filesystem. It is usually invoked
-          indirectly by the mount(8) command when using the "-t cifs" option.
-          </para>
-          <indexterm zone="cifsutils mount.cifs">
-            <primary sortas="b-mount.cifs">mount.cifs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setcifsacl">
-        <term><command>setcifsacl</command></term>
-        <listitem>
-          <para>is intended to alter an ACL of a security descriptor for a file
-          system object.</para>
-          <indexterm zone="cifsutils setcifsacl">
-            <primary sortas="b-setcifsacl">setcifsacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/netfs.xml
===================================================================
--- networking/netprogs/netfs.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?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;
-]>
-
-<sect1 id="postlfs-config-netfs"  xreflabel="Configuring for Network Filesystems">
-  <?dbhtml filename="netfs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Configuring for Network Filesystems</title>
-
-  <!-- Fake the zone for index formatting -->
-  <indexterm zone="postlfs-config-netfs postlfs-config-netfs">
-    <primary sortas="f-netfs">netfs</primary>
-  </indexterm>
-
-  <para>While LFS is capable of mounting network file systems such as NFS,
-  these are not mounted by the <filename>mountfs</filename> init script.
-  Network file systems must be mounted after the networking is activated and
-  unmounted before the network goes down.  The <filename>netfs</filename>
-  bootscript was written to handle both boot-time mounting of network
-  filesystems, if the entry in <filename>/etc/fstab</filename> contains the
-  <option>_netdev</option> option, and unmounting of all network filesystems
-  before the network is brought down.</para>
-
-  <para>As the <systemitem class="username">root</systemitem> user, install
-  the <filename>/etc/rc.d/init.d/netfs</filename> bootscript included with the
-  <xref linkend="bootscripts"/> package.</para>
-
-<screen role='root'><userinput>make install-netfs</userinput></screen>
-
-</sect1>
Index: networking/netprogs/netprogs.xml
===================================================================
--- networking/netprogs/netprogs.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ networking/netprogs/netprogs.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -22,16 +22,15 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bridgeutils-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cifsutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cifsutils-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="netfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpcbind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nfs-utils-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ntp-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpcbind-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wget.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpa_supplicant.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wpa_supplicant-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="othernetprogs.xml"/>
 
Index: networking/netprogs/nfs-utils-systemd.xml
===================================================================
--- networking/netprogs/nfs-utils-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/nfs-utils-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,483 @@
+<?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 nfs-utils-download-http "&sourceforge-repo;/nfs/nfs-utils-&nfs-utils-version;.tar.bz2">
+  <!ENTITY nfs-utils-download-ftp  " ">
+  <!ENTITY nfs-utils-md5sum        "97f157f954edb6d4d4385a0c5986f36f">
+  <!ENTITY nfs-utils-size          "768 KB">
+  <!ENTITY nfs-utils-buildsize     "20 MB">
+  <!ENTITY nfs-utils-time          "0.2 SBU">
+]>
+
+<sect1 id="nfs-utils" xreflabel="nfs-utils-&nfs-utils-version;">
+  <?dbhtml filename="nfs-utils.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>NFS-Utils-&nfs-utils-version;</title>
+
+  <indexterm zone="nfs-utils">
+    <primary sortas="a-Nfs-utils">NFS Utilities</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to NFS Utilities</title>
+
+    <para>The <application>NFS Utilities</application> package contains the
+    userspace server and client tools necessary to use the kernel's NFS
+    abilities. NFS is a protocol that allows sharing file systems over the
+    network.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nfs-utils-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nfs-utils-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nfs-utils-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nfs-utils-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nfs-utils-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nfs-utils-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">NFS Utilities Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libtirpc"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libevent"/>,
+      <xref linkend="sqlite"/> and
+      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libnfsidmap</ulink> (for NFSv4 support),
+      <xref linkend="mitkrb"/> or
+      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>, and
+      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">librpcsecgss</ulink> (for GSS and RPC security support) 
+    </para>
+
+    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
+    <para role="required">
+      <xref linkend="rpcbind"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nfs-utils"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id='nfs-utils-kernel'>
+    <title>Kernel Configuration</title>
+
+    <para>Enable the following options in the kernel configuration
+    and recompile the kernel if necessary:</para>
+
+<screen><literal>File systems  ---&gt;
+  Network File Systems  ---&gt;
+    NFS client support: Y or M
+    NFS server support: Y or M</literal></screen>
+
+    <para>Select the appropriate sub-options that appear when the above options
+    are selected.</para>
+
+    <indexterm zone="nfs-utils nfs-utils-kernel">
+      <primary sortas="d-nfs-utils">NFS Utilities</primary>
+    </indexterm>
+
+  </sect2>
+
+  <sect2 role="installation" id='nfs-utils-install'
+         xreflabel='NFS Utilities Installation'>
+    <title>Installation of NFS Utilities</title>
+
+    <para>Before you compile the program, ensure that the <systemitem
+    class="username">nobody</systemitem> user and <systemitem
+    class="groupname">nogroup</systemitem> group have been created as done in
+    the current LFS book.  You can add them by running the following commands
+    as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+    -s /bin/false -u 99 nobody</userinput></screen>
+
+    <note>
+      <para>The classic uid and gid values are 65534 which is also -2 when
+      interpreted as a signed 16-bit number.  These values impact other files
+      on some filesystems that do not have support for sparse files.  The
+      <systemitem class="username">nobody</systemitem> and <systemitem
+      class="groupname">nogroup</systemitem> values are relatively arbitrary.
+      The impact on a server is nil if the <filename>exports</filename> file
+      is configured correctly. If it is misconfigured, an
+      <command>ls -l</command> or <command>ps</command> listing will show a
+      uid or gid number of 65534 instead of a name. The client uses <systemitem
+      class="username">nobody</systemitem> only as the user running
+      <command>rpc.statd</command>.</para>
+    </note>
+
+    <para>Install <application>NFS Utilities</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr          \
+            --sysconfdir=/etc      \
+            --without-tcp-wrappers \
+            --disable-nfsv4        \
+            --disable-gss &amp;&amp;
+make</userinput></screen>
+
+    <para>If your <filename class="directory">/usr</filename> directory
+    is NFS mounted, you should install the executables in
+    <filename class="directory">/sbin</filename> by passing
+    an additional parameter <option>--sbindir=/sbin</option> to the
+    above <command>./configure</command> command.</para>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- dev note: make statduser=$(whoami) DESTDIR=<DESTDIR> install -->
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--without-tcp-wrappers</parameter>: This option is
+    needed because TCP Wrappers is not in BLFS.</para>
+
+    <para><parameter>--disable-nfsv4</parameter>: Disables support
+    for NFS version 4.</para>
+
+    <para><parameter>--disable-gss</parameter>: Disables support for
+    RPCSEC GSS (RPC Security).</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring NFS Utilities</title>
+
+    <sect3 id='nfs-utils-server-config'>
+      <title>Server Configuration</title>
+
+      <para><filename>/etc/exports</filename> contains the exported directories
+      on NFS servers. Refer to the <filename>exports.5</filename> manual page
+      for the syntax of this file. Also refer to the "NFS HowTo" available at
+      <ulink url="http://nfs.sourceforge.net/nfs-howto/"/> for information on
+      how to configure the servers and clients in a secure manner. For example,
+      for sharing the <filename class="directory">/home</filename> directory
+      over the local network, the following line may be added:</para>
+
+<screen role="root"><userinput>/home <replaceable>&lt;192.168.0.0/24&gt;</replaceable>(rw,subtree_check,anonuid=99,anongid=99)</userinput></screen>
+
+      <indexterm zone="nfs-utils nfs-utils-server-config">
+        <primary sortas="e-etc-exportfs">/etc/exportfs</primary>
+      </indexterm>
+
+      <sect4 id="nfs-utils-server-init">
+        <title>Systemd Units</title>
+
+        <para>
+          To start the NFS server daemons at boot,
+          install the systemd units from the <xref linkend="bootscripts"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+<screen role="root"><userinput>make install-nfs-server</userinput></screen>
+
+        <indexterm zone="nfs-utils nfs-utils-server-init">
+          <primary sortas="f-nfs-server">nfs-server</primary>
+        </indexterm>
+
+        <para>You can edit the <filename>/etc/default/nfs-utils</filename>
+        file to change the startup options for NFS daemons. Defaults should
+        be fine for most use cases.</para>
+
+        <indexterm zone="nfs-utils nfs-utils-server-init">
+          <primary sortas="e-etc-default-nfs-utils">/etc/default/nfs-utils</primary>
+        </indexterm>
+
+      </sect4>
+
+    </sect3>
+
+    <sect3 id='nfs-utils-client-config'>
+      <title>Client Configuration</title>
+
+      <para><filename>/etc/fstab</filename> contains the directories that
+      are to be mounted on the client. Alternately the partitions can be
+      mounted by using the <command>mount</command> command with the proper
+      options. To mount the <filename class="directory">/home</filename>
+      and <filename class="directory">/usr</filename> partitions, add the
+      following to the <filename>/etc/fstab</filename>:</para>
+
+<screen role="root"><userinput><replaceable>&lt;server-name&gt;</replaceable>:/home  /home nfs   rw,_netdev 0 0
+<replaceable>&lt;server-name&gt;</replaceable>:/usr   /usr  nfs   ro,_netdev 0 0</userinput></screen>
+
+      <para>The options which can be used are specified in <command>man 5 nfs</command>.
+      If both the client and server are running recent versions of linux, most of the
+      options will be negotiated. You can specify either <literal>rw</literal> or
+      <literal>ro</literal>, <literal>_netdev</literal> if the filesystem is to be
+      automatically mounted at boot, or <literal>noauto</literal> (and perhaps
+      <literal>user</literal>) for other filesystems.</para>
+
+      <para>If the fileserver is not running a recent version of linux, you may need to
+      specifiy other options.</para>
+
+      <para>If you are using systemd, you may need to enable autofs v4 in your kernel,
+      and add the option <literal>comment=systemd.automount</literal>. Some machines
+      need this, because systemd tries to mount the external fs&apos;s before the network
+      is up, others do not need it. An alternative is for <systemitem
+      class="username">root</systemitem> to run <command>mount -a</command>.</para>
+
+      <indexterm zone="nfs-utils nfs-utils-client-config">
+        <primary sortas="e-etc-fstab">/etc/fstab</primary>
+      </indexterm>
+
+<!-- /etc/netconfig is installed by libtirpc
+      <para>In some circumstances an <filename>/etc/netconfig</filename> file
+      is required by an nfs client. It does no harm to create one even if it
+      is not in fact needed. As the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/netconfig &lt;&lt; "EOF"
+udp6 tpi_clts v inet6 udp - -
+tcp6 tpi_cots_ord v inet6 tcp - -
+udp tpi_clts v inet udp - -
+tcp tpi_cots_ord v inet tcp - -
+rawip tpi_raw - inet - - -
+local tpi_cots_ord - loopback - - -
+EOF</userinput></screen>
+
+      <indexterm zone="nfs-utils nfs-utils-client-config">
+        <primary sortas="e-etc-netconfig">/etc/netconfig</primary>
+      </indexterm>
+-->
+
+      <sect4  id="nfs-utils-client-init">
+        <title>Systemd Units</title>
+
+        <note><para>The following systemd unis are not required if the
+        nfs-server units were previously installed.</para></note>
+
+        <para>
+          To start the NFS client services at boot,
+          install the systemd units from the <xref linkend="bootscripts"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+<screen role="root"><userinput>make install-nfs-client</userinput></screen>
+
+        <indexterm zone="nfs-utils nfs-utils-client-config">
+          <primary sortas="f-nfs-client">nfs-client</primary>
+        </indexterm>
+
+      </sect4>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>exportfs, mountstats, mount.nfs, mount.nfs4 (link to mount.nfs),
+        nfsiostat, nfsstat, osd_login, rpc.mountd, rpc.nfsd, rpc.statd, rpcdebug,
+        showmount, sm-notify, start-statd, umount.nfs (link to mount.nfs),
+        and umount.nfs4  (link to mount.nfs)</seg>
+        <seg>None</seg>
+        <seg>/var/lib/nfs</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="exportfs">
+        <term><command>exportfs</command></term>
+        <listitem>
+          <para>maintains a list of NFS exported file systems.</para>
+          <indexterm zone="nfs-utils exportfs">
+            <primary sortas="b-exportfs">exportfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountstats">
+        <term><command>mountstats</command></term>
+        <listitem>
+          <para>displays NFS client per-mount statistics.</para>
+          <indexterm zone="nfs-utils mountstats">
+            <primary sortas="b-mountstats">mountstats</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountnfs">
+        <term><command>mount.nfs</command></term>
+        <listitem>
+          <para>Used to mount a network share using NFS</para>
+          <indexterm zone="nfs-utils mountnfs">
+            <primary sortas="b-mountnfs">mount.nfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountnfs4">
+        <term><command>mount.nfs4</command></term>
+        <listitem>
+          <para>Used to mount a network share using NFSv4</para>
+          <indexterm zone="nfs-utils mountnfs4">
+            <primary sortas="b-mountnfs4">mount.nfs4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nfsiostat-nfs-utils">
+        <term><command>nfsiostat</command></term>
+        <listitem>
+          <para>Report input/output statistics for network filesystems.</para>
+          <indexterm zone="nfs-utils nfsiostat-nfs-utils">
+            <primary sortas="b-nfsiostat-nfs-utils">nfsiostat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nfsstat">
+        <term><command>nfsstat</command></term>
+        <listitem>
+          <para>displays statistics kept about NFS client and server activity.</para>
+          <indexterm zone="nfs-utils nfsstat">
+            <primary sortas="b-nfsstat">nfsstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcmountd">
+        <term><command>rpc.mountd</command></term>
+        <listitem>
+          <para>implements the NFS mount protocol on an NFS server.</para>
+          <indexterm zone="nfs-utils rpcmountd">
+            <primary sortas="b-rpcmountd">rpc.mountd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcnfsd">
+        <term><command>rpc.nfsd</command></term>
+        <listitem>
+          <para>implements the user level part of the NFS
+          service on the server.</para>
+          <indexterm zone="nfs-utils rpcnfsd">
+            <primary sortas="b-rpcnfsd">rpc.nfsd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcstatd">
+        <term><command>rpc.statd</command></term>
+        <listitem>
+          <para>is used by the NFS file locking service. Run on both sides,
+          client as well as server, when you want file locking enabled.</para>
+          <indexterm zone="nfs-utils rpcstatd">
+            <primary sortas="b-rpcstatd">rpc.statd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcdebug">
+        <term><command>rpcdebug</command></term>
+        <listitem>
+          <para>sets or clears the kernel's NFS client and server debug
+          flags.</para>
+          <indexterm zone="nfs-utils rpcdebug">
+            <primary sortas="b-rpcdebug">rpcdebug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="showmount">
+        <term><command>showmount</command></term>
+        <listitem>
+          <para>displays mount information for an NFS server.</para>
+          <indexterm zone="nfs-utils showmount">
+            <primary sortas="b-showmount">showmount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sm-notify">
+        <term><command>sm-notify</command></term>
+        <listitem>
+          <para>is used to send Network Status Monitor reboot messages.</para>
+          <indexterm zone="nfs-utils sm-notify">
+            <primary sortas="b-sm-notify">sm-notify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="start-statd">
+        <term><command>start-statd</command></term>
+        <listitem>
+          <para>is a script called by nfsmount when mounting a filesystem with
+          locking enabled, if statd does not appear to be running. It can be
+          customised with whatever flags are appropriate for the site.</para>
+          <indexterm zone="nfs-utils start-statd">
+            <primary sortas="b-start-statd">start-statd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umountnfs">
+        <term><command>umount.nfs</command></term>
+        <listitem>
+          <para>Used to unmount a network share using NFS</para>
+          <indexterm zone="nfs-utils umountnfs">
+            <primary sortas="b-umountnfs">umount.nfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umountnfs4">
+        <term><command>umount.nfs4</command></term>
+        <listitem>
+          <para>Used to unmount a network share using NFSv4</para>
+          <indexterm zone="nfs-utils umountnfs4">
+            <primary sortas="b-umountnfs4">umount.nfs4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,497 +1,0 @@
-<?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 nfs-utils-download-http "&sourceforge-repo;/nfs/nfs-utils-&nfs-utils-version;.tar.bz2">
-  <!ENTITY nfs-utils-download-ftp  " ">
-  <!ENTITY nfs-utils-md5sum        "97f157f954edb6d4d4385a0c5986f36f">
-  <!ENTITY nfs-utils-size          "768 KB">
-  <!ENTITY nfs-utils-buildsize     "20 MB">
-  <!ENTITY nfs-utils-time          "0.2 SBU">
-]>
-
-<sect1 id="nfs-utils" xreflabel="nfs-utils-&nfs-utils-version;">
-  <?dbhtml filename="nfs-utils.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>NFS-Utils-&nfs-utils-version;</title>
-
-  <indexterm zone="nfs-utils">
-    <primary sortas="a-Nfs-utils">NFS Utilities</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NFS Utilities</title>
-
-    <para>The <application>NFS Utilities</application> package contains the
-    userspace server and client tools necessary to use the kernel's NFS
-    abilities. NFS is a protocol that allows sharing file systems over the
-    network.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nfs-utils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nfs-utils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nfs-utils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nfs-utils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nfs-utils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nfs-utils-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NFS Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="sqlite"/> and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libnfsidmap</ulink> (for NFSv4 support),
-      <xref linkend="mitkrb"/> or
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>, and
-      <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">librpcsecgss</ulink> (for GSS and RPC security support) and
-      <xref linkend="libcap-pam"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref linkend="rpcbind"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nfs-utils"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='nfs-utils-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>Enable the following options in the kernel configuration
-    and recompile the kernel if necessary:</para>
-
-<screen><literal>File systems  ---&gt;
-  Network File Systems  ---&gt;
-    NFS client support: Y or M
-    NFS server support: Y or M</literal></screen>
-
-    <para>Select the appropriate sub-options that appear when the above options
-    are selected.</para>
-
-    <indexterm zone="nfs-utils nfs-utils-kernel">
-      <primary sortas="d-nfs-utils">NFS Utilities</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation" id='nfs-utils-install'
-         xreflabel='NFS Utilities Installation'>
-    <title>Installation of NFS Utilities</title>
-
-    <para>Before you compile the program, ensure that the <systemitem
-    class="username">nobody</systemitem> user and <systemitem
-    class="groupname">nogroup</systemitem> group have been created as done in
-    the current LFS book.  You can add them by running the following commands
-    as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
-    -s /bin/false -u 99 nobody</userinput></screen>
-
-    <note>
-      <para>The classic uid and gid values are 65534 which is also -2 when
-      interpreted as a signed 16-bit number.  These values impact other files
-      on some filesystems that do not have support for sparse files.  The
-      <systemitem class="username">nobody</systemitem> and <systemitem
-      class="groupname">nogroup</systemitem> values are relatively arbitrary.
-      The impact on a server is nil if the <filename>exports</filename> file
-      is configured correctly. If it is misconfigured, an
-      <command>ls -l</command> or <command>ps</command> listing will show a
-      uid or gid number of 65534 instead of a name. The client uses <systemitem
-      class="username">nobody</systemitem> only as the user running
-      <command>rpc.statd</command>.</para>
-    </note>
-
-    <para>Install <application>NFS Utilities</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --without-tcp-wrappers \
-            --disable-nfsv4        \
-            --disable-gss &amp;&amp;
-make</userinput></screen>
-
-    <para>If your <filename class="directory">/usr</filename> directory
-    is NFS mounted, you should install the executables in
-    <filename class="directory">/sbin</filename> by passing
-    an additional parameter <option>--sbindir=/sbin</option> to the
-    above <command>./configure</command> command.</para>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- dev note: make statduser=$(whoami) DESTDIR=<DESTDIR> install -->
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-tcp-wrappers</parameter>: This option is
-    needed because TCP Wrappers is not in BLFS.</para>
-
-    <para><parameter>--disable-nfsv4</parameter>: Disables support
-    for NFS version 4.</para>
-
-    <para><parameter>--disable-gss</parameter>: Disables support for
-    RPCSEC GSS (RPC Security).</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring NFS Utilities</title>
-
-    <sect3 id='nfs-utils-server-config'>
-      <title>Server Configuration</title>
-
-      <para><filename>/etc/exports</filename> contains the exported directories
-      on NFS servers. Refer to the <filename>exports.5</filename> manual page
-      for the syntax of this file. Also refer to the "NFS HowTo" available at
-      <ulink url="http://nfs.sourceforge.net/nfs-howto/"/> for information on
-      how to configure the servers and clients in a secure manner. For example,
-      for sharing the <filename class="directory">/home</filename> directory
-      over the local network, the following line may be added:</para>
-
-<screen role="root"><userinput>/home <replaceable>&lt;192.168.0.0/24&gt;</replaceable>(rw,subtree_check,anonuid=99,anongid=99)</userinput></screen>
-
-      <indexterm zone="nfs-utils nfs-utils-server-config">
-        <primary sortas="e-etc-exportfs">/etc/exportfs</primary>
-      </indexterm>
-
-      <sect4 id="nfs-utils-server-init">
-        <title>Boot Script</title>
-
-        <para>Install the <filename>/etc/rc.d/init.d/nfs-server</filename>
-        init script included in the <xref linkend="bootscripts"/> package
-        to start the server at boot.</para>
-
-<screen role="root"><userinput>make install-nfs-server</userinput></screen>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init">
-          <primary sortas="f-nfs-server">nfs-server</primary>
-        </indexterm>
-
-        <para>Now create the <filename>/etc/sysconfig/nfs-server</filename>
-        configuration file:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/nfs-server &lt;&lt; "EOF"
-<literal>PORT="2049"
-PROCESSES="8"
-QUOTAS="no"
-KILLDELAY="10"</literal>
-EOF</userinput></screen>
-
-        <note><para>The above parameters may be optionally placed in
-        <filename>/etc/sysconfig/rc.site</filename>.</para></note>
-
-        <indexterm zone="nfs-utils nfs-utils-server-init">
-          <primary
-          sortas="e-etc-sysconfig-nfs-server">/etc/sysconfig/nfs-server</primary>
-        </indexterm>
-
-      </sect4>
-
-    </sect3>
-
-    <sect3 id='nfs-utils-client-config'>
-      <title>Client Configuration</title>
-
-      <para><filename>/etc/fstab</filename> contains the directories that
-      are to be mounted on the client. Alternately the partitions can be
-      mounted by using the <command>mount</command> command with the proper
-      options. To mount the <filename class="directory">/home</filename>
-      and <filename class="directory">/usr</filename> partitions, add the
-      following to the <filename>/etc/fstab</filename>:</para>
-
-<screen role="root"><userinput><replaceable>&lt;server-name&gt;</replaceable>:/home  /home nfs   rw,_netdev 0 0
-<replaceable>&lt;server-name&gt;</replaceable>:/usr   /usr  nfs   ro,_netdev 0 0</userinput></screen>
-
-      <para>The options which can be used are specified in <command>man 5 nfs</command>.
-      If both the client and server are running recent versions of linux, most of the
-      options will be negotiated. You can specify either <literal>rw</literal> or
-      <literal>ro</literal>, <literal>_netdev</literal> if the filesystem is to be
-      automatically mounted at boot, or <literal>noauto</literal> (and perhaps
-      <literal>user</literal>) for other filesystems.</para>
-
-      <para>If the fileserver is not running a recent version of linux, you may need to
-      specifiy other options.</para>
-
-      <para>If you are using systemd, you may need to enable autofs v4 in your kernel,
-      and add the option <literal>comment=systemd.automount</literal>. Some machines
-      need this, because systemd tries to mount the external fs&apos;s before the network
-      is up, others do not need it. An alternative is for <systemitem
-      class="username">root</systemitem> to run <command>mount -a</command>.</para>
-
-      <indexterm zone="nfs-utils nfs-utils-client-config">
-        <primary sortas="e-etc-fstab">/etc/fstab</primary>
-      </indexterm>
-
-<!-- /etc/netconfig is installed by libtirpc
-      <para>In some circumstances an <filename>/etc/netconfig</filename> file
-      is required by an nfs client. It does no harm to create one even if it
-      is not in fact needed. As the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/netconfig &lt;&lt; "EOF"
-udp6 tpi_clts v inet6 udp - -
-tcp6 tpi_cots_ord v inet6 tcp - -
-udp tpi_clts v inet udp - -
-tcp tpi_cots_ord v inet tcp - -
-rawip tpi_raw - inet - - -
-local tpi_cots_ord - loopback - - -
-EOF</userinput></screen>
-
-      <indexterm zone="nfs-utils nfs-utils-client-config">
-        <primary sortas="e-etc-netconfig">/etc/netconfig</primary>
-      </indexterm>
--->
-
-      <sect4  id="nfs-utils-client-init">
-        <title>Boot Script</title>
-
-        <note><para>The following boot script is not required if the
-        nfs-server script is installed.</para></note>
-
-        <para>Install the <filename>/etc/rc.d/init.d/nfs-client</filename> init
-        script included in the <xref linkend="bootscripts"/> package to start
-        the client services at boot.</para>
-
-<screen role="root"><userinput>make install-nfs-client</userinput></screen>
-
-        <indexterm zone="nfs-utils nfs-utils-client-config">
-          <primary sortas="f-nfs-client">nfs-client</primary>
-        </indexterm>
-
-        <para>To automatically mount <systemitem
-        class="filesystem">nfs</systemitem> filesystems, clients will also need
-        to install the <filename>netfs</filename> bootscript as described in
-        <xref linkend="postlfs-config-netfs"/>.</para>
-
-        <indexterm zone="nfs-utils nfs-utils-client-config">
-          <primary sortas="f-netfs">netfs</primary>
-        </indexterm>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>exportfs, mountstats, mount.nfs, mount.nfs4 (link to mount.nfs),
-        nfsiostat, nfsstat, osd_login, rpc.mountd, rpc.nfsd, rpc.statd, rpcdebug,
-        showmount, sm-notify, start-statd, umount.nfs (link to mount.nfs),
-        and umount.nfs4  (link to mount.nfs)</seg>
-        <seg>None</seg>
-        <seg>/var/lib/nfs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exportfs">
-        <term><command>exportfs</command></term>
-        <listitem>
-          <para>maintains a list of NFS exported file systems.</para>
-          <indexterm zone="nfs-utils exportfs">
-            <primary sortas="b-exportfs">exportfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountstats">
-        <term><command>mountstats</command></term>
-        <listitem>
-          <para>displays NFS client per-mount statistics.</para>
-          <indexterm zone="nfs-utils mountstats">
-            <primary sortas="b-mountstats">mountstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountnfs">
-        <term><command>mount.nfs</command></term>
-        <listitem>
-          <para>Used to mount a network share using NFS</para>
-          <indexterm zone="nfs-utils mountnfs">
-            <primary sortas="b-mountnfs">mount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountnfs4">
-        <term><command>mount.nfs4</command></term>
-        <listitem>
-          <para>Used to mount a network share using NFSv4</para>
-          <indexterm zone="nfs-utils mountnfs4">
-            <primary sortas="b-mountnfs4">mount.nfs4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsiostat-nfs-utils">
-        <term><command>nfsiostat</command></term>
-        <listitem>
-          <para>Report input/output statistics for network filesystems.</para>
-          <indexterm zone="nfs-utils nfsiostat-nfs-utils">
-            <primary sortas="b-nfsiostat-nfs-utils">nfsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nfsstat">
-        <term><command>nfsstat</command></term>
-        <listitem>
-          <para>displays statistics kept about NFS client and server activity.</para>
-          <indexterm zone="nfs-utils nfsstat">
-            <primary sortas="b-nfsstat">nfsstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcmountd">
-        <term><command>rpc.mountd</command></term>
-        <listitem>
-          <para>implements the NFS mount protocol on an NFS server.</para>
-          <indexterm zone="nfs-utils rpcmountd">
-            <primary sortas="b-rpcmountd">rpc.mountd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcnfsd">
-        <term><command>rpc.nfsd</command></term>
-        <listitem>
-          <para>implements the user level part of the NFS
-          service on the server.</para>
-          <indexterm zone="nfs-utils rpcnfsd">
-            <primary sortas="b-rpcnfsd">rpc.nfsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcstatd">
-        <term><command>rpc.statd</command></term>
-        <listitem>
-          <para>is used by the NFS file locking service. Run on both sides,
-          client as well as server, when you want file locking enabled.</para>
-          <indexterm zone="nfs-utils rpcstatd">
-            <primary sortas="b-rpcstatd">rpc.statd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcdebug">
-        <term><command>rpcdebug</command></term>
-        <listitem>
-          <para>sets or clears the kernel's NFS client and server debug
-          flags.</para>
-          <indexterm zone="nfs-utils rpcdebug">
-            <primary sortas="b-rpcdebug">rpcdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showmount">
-        <term><command>showmount</command></term>
-        <listitem>
-          <para>displays mount information for an NFS server.</para>
-          <indexterm zone="nfs-utils showmount">
-            <primary sortas="b-showmount">showmount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sm-notify">
-        <term><command>sm-notify</command></term>
-        <listitem>
-          <para>is used to send Network Status Monitor reboot messages.</para>
-          <indexterm zone="nfs-utils sm-notify">
-            <primary sortas="b-sm-notify">sm-notify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="start-statd">
-        <term><command>start-statd</command></term>
-        <listitem>
-          <para>is a script called by nfsmount when mounting a filesystem with
-          locking enabled, if statd does not appear to be running. It can be
-          customised with whatever flags are appropriate for the site.</para>
-          <indexterm zone="nfs-utils start-statd">
-            <primary sortas="b-start-statd">start-statd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umountnfs">
-        <term><command>umount.nfs</command></term>
-        <listitem>
-          <para>Used to unmount a network share using NFS</para>
-          <indexterm zone="nfs-utils umountnfs">
-            <primary sortas="b-umountnfs">umount.nfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umountnfs4">
-        <term><command>umount.nfs4</command></term>
-        <listitem>
-          <para>Used to unmount a network share using NFSv4</para>
-          <indexterm zone="nfs-utils umountnfs4">
-            <primary sortas="b-umountnfs4">umount.nfs4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/ntp-systemd.xml
===================================================================
--- networking/netprogs/ntp-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/ntp-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,339 @@
+<?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 ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-&ntp-version;.tar.gz">
+  <!ENTITY ntp-download-ftp  "&gentoo-ftp-repo;/ntp-&ntp-version;.tar.gz">
+  <!ENTITY ntp-md5sum        "00df80a84ec9528fcfb09498075525bc">
+  <!ENTITY ntp-size          "4.1 MB">
+  <!ENTITY ntp-buildsize     "48 MB">
+  <!ENTITY ntp-time          "0.5 SBU">
+]>
+
+<sect1 id="ntp" xreflabel="ntp-&ntp-version;">
+  <?dbhtml filename="ntp.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ntp-&ntp-version;</title>
+
+  <indexterm zone="ntp">
+    <primary sortas="a-ntp">ntp</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ntp</title>
+
+    <para>The <application>ntp</application> package contains a
+    client and server to keep the time synchronized between various computers over
+    a network. This package is the official reference implementation of the
+    NTP protocol.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ntp-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ntp-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ntp-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ntp-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ntp-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ntp-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openssl"/> and
+      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ntp"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ntp</title>
+
+    <para>
+      There should be a dedicated user and group to take control
+      of the <command>ntpd</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 87 ntp &amp;&amp;
+useradd -c "Network Time Protocol" -d /var/lib/ntp -u 87 \
+        -g ntp -s /bin/false ntp</userinput></screen>
+
+    <para>Install <application>ntp</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --enable-linuxcaps    \
+            --with-binsubdir=sbin \
+            --with-lineeditlibs=readline &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -o ntp -g ntp -d /var/lib/ntp &amp;&amp;
+install -v -m755 -d /usr/share/doc/ntp-&ntp-version; &amp;&amp;
+cp -v -R html/* /usr/share/doc/ntp-&ntp-version;/</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-binsubdir=sbin</parameter>: This parameter places
+    the administrative programs in <filename
+    class="directory">/usr/sbin</filename>.</para>
+
+    <para><parameter>--enable-linuxcaps</parameter>: ntpd is run as user
+    ntp, so use Linux capabilities for non-root clock control.</para>
+
+    <para><option>--with-lineeditlibs=readline</option>: This option enables
+    <application>Readline</application> support for <command>ntpdc</command>
+    and <command>ntpq</command> programs. If omitted,
+    <application>libedit</application> will be used if installed, otherwise no
+    readline capabilites will be compiled.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ntp</title>
+
+    <sect3 id="ntp-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/ntp.conf</filename></para>
+
+      <indexterm zone="ntp ntp-config">
+        <primary sortas="e-etc-ntp.conf">/etc/ntp.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>The following configuration file defines various ntp servers
+      with open access from different continents. It also creates a
+      drift file where <command>ntpd</command> stores the frequency
+      offset and a pid file to store the <command>ntpd</command> process
+      ID. Since the documentation included with the package is sparse,
+      visit the ntp website at <ulink url="http://www.ntp.org/"/> and
+      <ulink url="http://www.pool.ntp.org/"/> for more information.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/ntp.conf &lt;&lt; "EOF"
+<literal># Asia
+server 0.asia.pool.ntp.org
+
+# Australia
+server 0.oceania.pool.ntp.org
+
+# Europe
+server 0.europe.pool.ntp.org
+
+# North America
+server 0.north-america.pool.ntp.org
+
+# South America
+server 2.south-america.pool.ntp.org
+
+driftfile /var/lib/ntp/ntp.drift
+pidfile   /var/run/ntpd.pid</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="ntp-init">
+      <title>Synchronizing the Time</title>
+
+      <para>There are two options. Option one is to run <command>ntpd</command>
+      continuously and allow it to synchronize the time in a gradual manner. The
+      other option is to run <command>ntpd</command> periodically (using cron)
+      and update the time each time <command>ntpd</command> is scheduled.</para>
+
+      <para>
+        To start the <command>ntpd</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="ntp ntp-init">
+        <primary sortas="f-ntp">ntp</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-ntpd</userinput></screen>
+
+      <para>If you prefer to run <command>ntpd</command> periodically, add the
+      following command to <systemitem class="username">root</systemitem>'s
+      <filename>crontab</filename>:</para>
+
+<screen><literal>ntpd -q</literal></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>ntp-keygen, ntp-wait, ntpd, ntpdate, ntpdc, ntpq,
+        ntptime, ntptrace, sntp and tickadj</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/ntp-&ntp-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ntp-keygen">
+        <term><command>ntp-keygen</command></term>
+        <listitem>
+          <para>generates cryptographic data files used by the NTPv4 authentication
+          and identification schemes.</para>
+          <indexterm zone="ntp ntp-keygen">
+            <primary sortas="b-ntp-keygen">ntp-keygen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntp-wait">
+        <term><command>ntp-wait</command></term>
+        <listitem>
+          <para>is useful at boot time, to delay the boot sequence until
+          <command>ntpd</command> has set the time.</para>
+          <indexterm zone="ntp ntp-wait">
+            <primary sortas="b-ntp-wait">ntp-wait</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntpd">
+        <term><command>ntpd</command></term>
+        <listitem>
+          <para>is a ntp daemon that runs in the background and keeps
+          the date and time synchronized based on response from configured
+          ntp servers. It also functions as a ntp server.</para>
+          <indexterm zone="ntp ntpd">
+            <primary sortas="b-ntpd">ntpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntpdate">
+        <term><command>ntpdate</command></term>
+        <listitem>
+          <para>is a client program that sets the date and time based on
+          the response from an ntp server. This command is deprecated.</para>
+          <indexterm zone="ntp ntpdate">
+            <primary sortas="b-ntpdate">ntpdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntpdc">
+        <term><command>ntpdc</command></term>
+        <listitem>
+          <para>is used to query the ntp daemon about its current state
+          and to request changes in that state.</para>
+          <indexterm zone="ntp ntpdc">
+            <primary sortas="b-ntpdc">ntpdc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntpq">
+        <term><command>ntpq</command></term>
+        <listitem>
+          <para>is an utility program used to monitor <command>ntpd</command>
+          operations and determine performance.</para>
+          <indexterm zone="ntp ntpq">
+            <primary sortas="b-ntpq">ntpq</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntptime">
+        <term><command>ntptime</command></term>
+        <listitem>
+          <para>reads and displays time-related kernel variables.</para>
+          <indexterm zone="ntp ntptime">
+            <primary sortas="b-ntptime">ntptime</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntptrace">
+        <term><command>ntptrace</command></term>
+        <listitem>
+          <para>traces a chain of ntp servers back to the primary source.</para>
+          <indexterm zone="ntp ntptrace">
+            <primary sortas="b-ntptrace">ntptrace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sntp">
+        <term><command>sntp</command></term>
+        <listitem>
+          <para>is a Simple Network Time Protocol (SNTP) client.</para>
+          <indexterm zone="ntp sntp">
+            <primary sortas="b-sntp">sntp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tickadj">
+        <term><command>tickadj</command></term>
+        <listitem>
+          <para>reads, and optionally modifies, several timekeeping-related
+          variables in older kernels that do not have support for precision
+          timekeeping.</para>
+          <indexterm zone="ntp tickadj">
+            <primary sortas="b-tickadj">tickadj</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?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 ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-&ntp-version;.tar.gz">
-  <!ENTITY ntp-download-ftp  "&gentoo-ftp-repo;/ntp-&ntp-version;.tar.gz">
-  <!ENTITY ntp-md5sum        "00df80a84ec9528fcfb09498075525bc">
-  <!ENTITY ntp-size          "4.1 MB">
-  <!ENTITY ntp-buildsize     "48 MB">
-  <!ENTITY ntp-time          "0.5 SBU">
-]>
-
-<sect1 id="ntp" xreflabel="ntp-&ntp-version;">
-  <?dbhtml filename="ntp.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ntp-&ntp-version;</title>
-
-  <indexterm zone="ntp">
-    <primary sortas="a-ntp">ntp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ntp</title>
-
-    <para>The <application>ntp</application> package contains a
-    client and server to keep the time synchronized between various computers over
-    a network. This package is the official reference implementation of the
-    NTP protocol.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ntp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ntp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ntp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ntp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ntp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ntp-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="openssl"/>, and
-      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ntp"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ntp</title>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>ntpd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 87 ntp &amp;&amp;
-useradd -c "Network Time Protocol" -d /var/lib/ntp -u 87 \
-        -g ntp -s /bin/false ntp</userinput></screen>
-
-    <para>Install <application>ntp</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --enable-linuxcaps    \
-            --with-binsubdir=sbin \
-            --with-lineeditlibs=readline &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -o ntp -g ntp -d /var/lib/ntp &amp;&amp;
-install -v -m755 -d /usr/share/doc/ntp-&ntp-version; &amp;&amp;
-cp -v -R html/* /usr/share/doc/ntp-&ntp-version;/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-binsubdir=sbin</parameter>: This parameter places
-    the administrative programs in <filename
-    class="directory">/usr/sbin</filename>.</para>
-
-    <para><parameter>--enable-linuxcaps</parameter>: ntpd is run as user
-    ntp, so use Linux capabilities for non-root clock control.</para>
-
-    <para><option>--with-lineeditlibs=readline</option>: This option enables
-    <application>Readline</application> support for <command>ntpdc</command>
-    and <command>ntpq</command> programs. If omitted,
-    <application>libedit</application> will be used if installed, otherwise no
-    readline capabilites will be compiled.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ntp</title>
-
-    <sect3 id="ntp-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/ntp.conf</filename></para>
-
-      <indexterm zone="ntp ntp-config">
-        <primary sortas="e-etc-ntp.conf">/etc/ntp.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The following configuration file defines various ntp servers
-      with open access from different continents. It also creates a
-      drift file where <command>ntpd</command> stores the frequency
-      offset and a pid file to store the <command>ntpd</command> process
-      ID. Since the documentation included with the package is sparse,
-      visit the ntp website at <ulink url="http://www.ntp.org/"/> and
-      <ulink url="http://www.pool.ntp.org/"/> for more information.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/ntp.conf &lt;&lt; "EOF"
-<literal># Asia
-server 0.asia.pool.ntp.org
-
-# Australia
-server 0.oceania.pool.ntp.org
-
-# Europe
-server 0.europe.pool.ntp.org
-
-# North America
-server 0.north-america.pool.ntp.org
-
-# South America
-server 2.south-america.pool.ntp.org
-
-driftfile /var/lib/ntp/ntp.drift
-pidfile   /var/run/ntpd.pid</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="ntp-init">
-      <title>Synchronizing the Time</title>
-
-      <para>There are two options. Option one is to run <command>ntpd</command>
-      continuously and allow it to synchronize the time in a gradual manner. The
-      other option is to run <command>ntpd</command> periodically (using cron)
-      and update the time each time <command>ntpd</command> is scheduled.</para>
-
-      <para>If you choose Option one, then install the
-      <filename>/etc/rc.d/init.d/ntp</filename>
-      init script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="ntp ntp-init">
-        <primary sortas="f-ntp">ntp</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-ntpd</userinput></screen>
-
-      <para>If you prefer to run <command>ntpd</command> periodically, add the
-      following command to <systemitem class="username">root</systemitem>'s
-      <filename>crontab</filename>:</para>
-
-<screen><literal>ntpd -q</literal></screen>
-
-      <para>Execute the following command if you would like to set the
-      hardware clock to the current system time at shutdown and reboot:</para>
-
-<screen role="root"><userinput>ln -v -sf ../init.d/setclock /etc/rc.d/rc0.d/K46setclock &amp;&amp;
-ln -v -sf ../init.d/setclock /etc/rc.d/rc6.d/K46setclock</userinput></screen>
-
-      <para>The other way around is already set up by LFS.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ntp-keygen, ntp-wait, ntpd, ntpdate, ntpdc, ntpq,
-        ntptime, ntptrace, sntp and tickadj</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/ntp-&ntp-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ntp-keygen">
-        <term><command>ntp-keygen</command></term>
-        <listitem>
-          <para>generates cryptographic data files used by the NTPv4 authentication
-          and identification schemes.</para>
-          <indexterm zone="ntp ntp-keygen">
-            <primary sortas="b-ntp-keygen">ntp-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntp-wait">
-        <term><command>ntp-wait</command></term>
-        <listitem>
-          <para>is useful at boot time, to delay the boot sequence until
-          <command>ntpd</command> has set the time.</para>
-          <indexterm zone="ntp ntp-wait">
-            <primary sortas="b-ntp-wait">ntp-wait</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpd">
-        <term><command>ntpd</command></term>
-        <listitem>
-          <para>is a ntp daemon that runs in the background and keeps
-          the date and time synchronized based on response from configured
-          ntp servers. It also functions as a ntp server.</para>
-          <indexterm zone="ntp ntpd">
-            <primary sortas="b-ntpd">ntpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpdate">
-        <term><command>ntpdate</command></term>
-        <listitem>
-          <para>is a client program that sets the date and time based on
-          the response from an ntp server. This command is deprecated.</para>
-          <indexterm zone="ntp ntpdate">
-            <primary sortas="b-ntpdate">ntpdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpdc">
-        <term><command>ntpdc</command></term>
-        <listitem>
-          <para>is used to query the ntp daemon about its current state
-          and to request changes in that state.</para>
-          <indexterm zone="ntp ntpdc">
-            <primary sortas="b-ntpdc">ntpdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntpq">
-        <term><command>ntpq</command></term>
-        <listitem>
-          <para>is an utility program used to monitor <command>ntpd</command>
-          operations and determine performance.</para>
-          <indexterm zone="ntp ntpq">
-            <primary sortas="b-ntpq">ntpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntptime">
-        <term><command>ntptime</command></term>
-        <listitem>
-          <para>reads and displays time-related kernel variables.</para>
-          <indexterm zone="ntp ntptime">
-            <primary sortas="b-ntptime">ntptime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntptrace">
-        <term><command>ntptrace</command></term>
-        <listitem>
-          <para>traces a chain of ntp servers back to the primary source.</para>
-          <indexterm zone="ntp ntptrace">
-            <primary sortas="b-ntptrace">ntptrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sntp">
-        <term><command>sntp</command></term>
-        <listitem>
-          <para>is a Simple Network Time Protocol (SNTP) client.</para>
-          <indexterm zone="ntp sntp">
-            <primary sortas="b-sntp">sntp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tickadj">
-        <term><command>tickadj</command></term>
-        <listitem>
-          <para>reads, and optionally modifies, several timekeeping-related
-          variables in older kernels that do not have support for precision
-          timekeeping.</para>
-          <indexterm zone="ntp tickadj">
-            <primary sortas="b-tickadj">tickadj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/rpcbind-systemd.xml
===================================================================
--- networking/netprogs/rpcbind-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/rpcbind-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,175 @@
+<?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 rpcbind-download-http "&sourceforge-repo;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
+  <!ENTITY rpcbind-download-ftp  " ">
+  <!ENTITY rpcbind-md5sum        "0a5f9c2142af814c55d957aaab3bcc68">
+  <!ENTITY rpcbind-size          "109 KB">
+  <!ENTITY rpcbind-buildsize     "1.9 MB">
+  <!ENTITY rpcbind-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="rpcbind" xreflabel="rpcbind-&rpcbind-version;">
+  <?dbhtml filename="rpcbind.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>rpcbind-&rpcbind-version;</title>
+
+  <indexterm zone="rpcbind">
+    <primary sortas="a-rpcbind">rpcbind</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to rpcbind</title>
+
+    <para>The <application>rpcbind</application> program is a replacement for
+    <application>portmap</application>.  It is required for import or export
+    of Network File System (NFS) shared directories. </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&rpcbind-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rpcbind-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rpcbind-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rpcbind-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rpcbind-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rpcbind-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">rpcbind Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libtirpc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/rpcbind"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rpcbind</title>
+
+    <!-- Packages should adapt to standards, not the other way around -->
+    <para>In order to get <application>rpcbind</application> to work
+    properly, first fix the package to use correct service name:</para>
+
+<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c &amp;&amp;
+sed -i "/error = getaddrinfo/s:rpcbind:sunrpc:" src/rpcinfo.c</userinput></screen>
+
+    <para>Install <application>rpcbind</application> by running the following
+    commands:</para>
+
+    <!-- specifying rpcuser only needed in 0.2.1, already fixed upstream -->
+<screen><userinput>./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>--with-rpcuser=root</command>: This works around an error in
+    the configure script.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring rpcbind</title>
+
+    <sect3 id="rpcbind-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>rpcbind</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="rpcbind rpcbind-init">
+         <primary sortas="f-rpcbind">rpcbind</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-rpcbind</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>rpcbind and rpcinfo</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rpcbind-prog">
+        <term><command>rpcbind</command></term>
+        <listitem>
+          <para>is a server that converts RPC program numbers into universal
+          addresses.  It must be running on the host to be able to make RPC
+          calls on a server on that machine.  </para>
+          <indexterm zone="rpcbind rpcbind-prog">
+            <primary sortas="b-rpcbind">rpcbind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcinfo">
+        <term><command>rpcinfo</command></term>
+        <listitem>
+          <para>makes an RPC call to an RPC server and reports data according
+          to the requested options.  </para>
+          <indexterm zone="rpcbind rpcinfo">
+            <primary sortas="b-rpcinfo">rpcinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?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 rpcbind-download-http "&sourceforge-repo;/rpcbind/rpcbind-&rpcbind-version;.tar.bz2">
-  <!ENTITY rpcbind-download-ftp  " ">
-  <!ENTITY rpcbind-md5sum        "0a5f9c2142af814c55d957aaab3bcc68">
-  <!ENTITY rpcbind-size          "109 KB">
-  <!ENTITY rpcbind-buildsize     "1.9 MB">
-  <!ENTITY rpcbind-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="rpcbind" xreflabel="rpcbind-&rpcbind-version;">
-  <?dbhtml filename="rpcbind.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>rpcbind-&rpcbind-version;</title>
-
-  <indexterm zone="rpcbind">
-    <primary sortas="a-rpcbind">rpcbind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rpcbind</title>
-
-    <para>The <application>rpcbind</application> program is a replacement for
-    <application>portmap</application>.  It is required for import or export
-    of Network File System (NFS) shared directories. </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rpcbind-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rpcbind-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rpcbind-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rpcbind-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rpcbind-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rpcbind-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rpcbind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rpcbind"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rpcbind</title>
-
-    <!-- Packages should adapt to standards, not the other way around -->
-    <para>In order to get <application>rpcbind</application> to work
-    properly, first fix the package to use correct service name:</para>
-
-<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c &amp;&amp;
-sed -i "/error = getaddrinfo/s:rpcbind:sunrpc:" src/rpcinfo.c</userinput></screen>
-
-    <para>Install <application>rpcbind</application> by running the following
-    commands:</para>
-
-    <!-- specifying rpcuser only needed in 0.2.1, already fixed upstream -->
-<screen><userinput>./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>--with-rpcuser=root</command>: This works around an error in
-    the configure script.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rpcbind</title>
-
-    <sect3 id="rpcbind-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/rpcbind</filename> init script
-      included in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="rpcbind rpcbind-init">
-         <primary sortas="f-rpcbind">rpcbind</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-rpcbind</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rpcbind and rpcinfo</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rpcbind-prog">
-        <term><command>rpcbind</command></term>
-        <listitem>
-          <para>is a server that converts RPC program numbers into universal
-          addresses.  It must be running on the host to be able to make RPC
-          calls on a server on that machine.  </para>
-          <indexterm zone="rpcbind rpcbind-prog">
-            <primary sortas="b-rpcbind">rpcbind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcinfo">
-        <term><command>rpcinfo</command></term>
-        <listitem>
-          <para>makes an RPC call to an RPC server and reports data according
-          to the requested options.  </para>
-          <indexterm zone="rpcbind rpcinfo">
-            <primary sortas="b-rpcinfo">rpcinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/rsync-systemd.xml
===================================================================
--- networking/netprogs/rsync-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/rsync-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,250 @@
+<?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 rsync-download-http "http://samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-download-ftp  "ftp://ftp.samba.org/pub/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-md5sum        "43bd6676f0b404326eee2d63be3cdcfe">
+  <!ENTITY rsync-size          "869 KB">
+  <!ENTITY rsync-buildsize     "9.0 MB">
+  <!ENTITY rsync-time          "0.3 SBU">
+]>
+
+<sect1 id="rsync" xreflabel="rsync-&rsync-version;">
+  <?dbhtml filename="rsync.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>rsync-&rsync-version;</title>
+
+  <indexterm zone="rsync">
+    <primary sortas="a-rsync">rsync</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to rsync</title>
+
+    <para>The <application>rsync</application> package contains the
+    <command>rsync</command> utility. This is useful for synchronizing large
+    file archives over a network.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&rsync-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rsync-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rsync-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rsync-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rsync-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rsync-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">rsync Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="popt"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/rsync"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rsync</title>
+
+    <para>For security reasons, running the <application>rsync</application>
+    server as an unprivileged user and group is encouraged. If you intend to
+    run <command>rsync</command> as a daemon, create the
+    <systemitem class="username">rsyncd</systemitem> user and group
+    with the following commands issued by the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 48 rsyncd &amp;&amp;
+useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
+    -s /bin/false -u 48 rsyncd</userinput></screen>
+
+    <para>Install <application>rsync</application> by running the following
+    commands:</para>
+
+<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>
+
+<screen role='root'><userinput>make install</userinput></screen>
+
+    <para>If you built the documentation, install it using the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &amp;&amp;
+install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--without-included-zlib</parameter>: This switch enables
+      compilation with system-installed zlib library.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring rsync</title>
+
+    <sect3 id="rsync-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/rsyncd.conf</filename></para>
+
+      <indexterm zone="rsync rsync-config">
+        <primary sortas="e-etc-rsyncd.conf">/etc/rsyncd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>For client access to remote files, you may need to install the
+      <xref linkend="openssh"/> package to connect to the remote server.</para>
+
+      <para>This is a simple download-only configuration to set up running
+      <command>rsync</command> as a server. See the rsyncd.conf(5)
+      man-page for additional options (i.e., user authentication).</para>
+
+<screen role="root"><userinput>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"
+<literal># This is a basic rsync configuration file
+# It exports a single module without user authentication.
+
+motd file = /home/rsync/welcome.msg
+use chroot = yes
+
+[localhost]
+    path = /home/rsync
+    comment = Default rsync module
+    read only = yes
+    list = yes
+    uid = rsyncd
+    gid = rsyncd
+</literal>
+EOF</userinput></screen>
+
+    <para>You can find additional configuration information and general
+    documentation about <command>rsync</command> at
+    <ulink url="http://rsync.samba.org/documentation.html"/>.</para>
+
+    </sect3>
+
+    <sect3 id="rsync-init">
+      <title>Systemd Units</title>
+
+      <para>Note that you only want to start the
+      <application>rsync</application> server if you want to provide an
+      <application>rsync</application> archive on your local machine.
+      You don't need this unit to run the
+      <application>rsync</application> client.</para>
+
+      <para>
+        To start the <command>rsync</command> daemon at boot,
+        install the systemd units from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install-rsyncd</userinput></screen>
+
+      <note>
+        <para>
+          This package comes with two types of units: A service file and a socket file.
+          The service file will start rsync daemon once at boot and it will keep running until the
+          system shuts down. The socket file will make systemd listen on rsync port (Default 873, needs
+          to be edited for anything else) and will start rsync daemon when something tries to connect
+          to that port and stop the daemon when the connection is terminated. This is
+          called socket activation.
+
+          By default, the first method is used - rsync daemon is started at boot and stopped at shutdown.
+          If the socket method is desired, you need to run as the
+          <systemitem class="username">root</systemitem> user:
+
+<screen role="root"><userinput>systemctl stop rsyncd &amp;&amp;
+systemctl disable rsyncd &amp;&amp;
+systemctl enable rsyncd.socket &amp;&amp;
+systemctl start rsyncd.socket</userinput></screen>
+
+          Note that socket method is only useful for remote backups. For local backups you'll need the
+          service method.
+        </para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>rsync</seg>
+        <seg>None</seg>
+        <seg>Optionally, /usr/share/doc/rsync-&rsync-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rsync-prog">
+        <term><command>rsync</command></term>
+        <listitem>
+          <para>is a replacement for <command>rcp</command> (and
+          <command>scp</command>) that has many more features. It uses the
+          <quote>rsync algorithm</quote> which provides a very fast method of
+          syncing remote files. It does this by sending just the differences
+          in the files across the link, without requiring that both sets of
+          files are present at one end of the link beforehand.</para>
+          <indexterm zone="rsync rsync-prog">
+            <primary sortas="b-rsync">rsync</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?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 rsync-download-http "http://samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-download-ftp  "ftp://ftp.samba.org/pub/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-md5sum        "43bd6676f0b404326eee2d63be3cdcfe">
-  <!ENTITY rsync-size          "869 KB">
-  <!ENTITY rsync-buildsize     "9.0 MB">
-  <!ENTITY rsync-time          "0.3 SBU">
-]>
-
-<sect1 id="rsync" xreflabel="rsync-&rsync-version;">
-  <?dbhtml filename="rsync.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>rsync-&rsync-version;</title>
-
-  <indexterm zone="rsync">
-    <primary sortas="a-rsync">rsync</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rsync</title>
-
-    <para>The <application>rsync</application> package contains the
-    <command>rsync</command> utility. This is useful for synchronizing large
-    file archives over a network.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rsync-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rsync-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rsync-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rsync-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rsync-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rsync-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rsync Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="popt"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rsync"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rsync</title>
-
-    <para>For security reasons, running the <application>rsync</application>
-    server as an unprivileged user and group is encouraged. If you intend to
-    run <command>rsync</command> as a daemon, create the
-    <systemitem class="username">rsyncd</systemitem> user and group
-    with the following commands issued by the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 48 rsyncd &amp;&amp;
-useradd -c "rsyncd Daemon" -d /home/rsync -g rsyncd \
-    -s /bin/false -u 48 rsyncd</userinput></screen>
-
-    <para>Install <application>rsync</application> by running the following
-    commands:</para>
-
-<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>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-    <para>If you built the documentation, install it using the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>install -v -m755 -d          /usr/share/doc/rsync-&rsync-version;/api &amp;&amp;
-install -v -m644 dox/html/*  /usr/share/doc/rsync-&rsync-version;/api</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-included-zlib</parameter>: This switch enables
-      compilation with system-installed zlib library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rsync</title>
-
-    <sect3 id="rsync-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/rsyncd.conf</filename></para>
-
-      <indexterm zone="rsync rsync-config">
-        <primary sortas="e-etc-rsyncd.conf">/etc/rsyncd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>For client access to remote files, you may need to install the
-      <xref linkend="openssh"/> package to connect to the remote server.</para>
-
-      <para>This is a simple download-only configuration to set up running
-      <command>rsync</command> as a server. See the rsyncd.conf(5)
-      man-page for additional options (i.e., user authentication).</para>
-
-<screen role="root"><userinput>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"
-<literal># This is a basic rsync configuration file
-# It exports a single module without user authentication.
-
-motd file = /home/rsync/welcome.msg
-use chroot = yes
-
-[localhost]
-    path = /home/rsync
-    comment = Default rsync module
-    read only = yes
-    list = yes
-    uid = rsyncd
-    gid = rsyncd
-</literal>
-EOF</userinput></screen>
-
-    <para>You can find additional configuration information and general
-    documentation about <command>rsync</command> at
-    <ulink url="http://rsync.samba.org/documentation.html"/>.</para>
-
-    </sect3>
-
-    <sect3 id="rsync-init">
-      <title>Boot Script</title>
-
-      <para>Note that you only want to start the
-      <application>rsync</application> server if you want to provide an
-      <application>rsync</application> archive on your local machine.
-      You don't need this script to run the
-      <application>rsync</application> client.</para>
-
-      <para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename> init
-      script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-<screen role="root"><userinput>make install-rsyncd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rsync</seg>
-        <seg>None</seg>
-        <seg>Optionally, /usr/share/doc/rsync-&rsync-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsync-prog">
-        <term><command>rsync</command></term>
-        <listitem>
-          <para>is a replacement for <command>rcp</command> (and
-          <command>scp</command>) that has many more features. It uses the
-          <quote>rsync algorithm</quote> which provides a very fast method of
-          syncing remote files. It does this by sending just the differences
-          in the files across the link, without requiring that both sets of
-          files are present at one end of the link beforehand.</para>
-          <indexterm zone="rsync rsync-prog">
-            <primary sortas="b-rsync">rsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/samba-systemd.xml
===================================================================
--- networking/netprogs/samba-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/samba-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,938 @@
+<?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 samba-download-http "http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
+  <!ENTITY samba-download-ftp  "ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
+  <!ENTITY samba-md5sum        "7ed2d4a181e55baa995eb8b58a9ad293">
+  <!ENTITY samba-size          "19 MB">
+  <!ENTITY samba-buildsize     "415 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "6.2 SBU (additional 5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
+]>
+
+<sect1 id="samba" xreflabel="Samba-&samba-version;">
+  <?dbhtml filename="samba.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Samba-&samba-version;</title>
+
+  <indexterm zone="samba">
+    <primary sortas="a-Samba">Samba</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Samba</title>
+
+    <para>The <application>Samba</application> package provides file and print
+    services to SMB/CIFS clients and Windows networking to Linux clients.
+    <application>Samba</application> can also be configured as a Windows Domain
+    Controller replacement, a file/print server acting as a member of a Windows
+    Active Directory domain and a NetBIOS (rfc1001/1002) nameserver (which
+    among other things provides LAN browsing support).</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&samba-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&samba-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &samba-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &samba-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &samba-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &samba-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Samba Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="python2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libxslt"/> (for documentation)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="gnutls"/>,
+      <xref linkend="libgpg-error"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="popt"/>,
+      <xref linkend="valgrind"/> (optionally used by the test suite),
+      <xref linkend="xfsprogs"/>,
+      <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
+      <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
+      <ulink url="http://ftp.de.debian.org/debian/pool/main/liba/libaio/">libaio</ulink>,
+      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
+      <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
+      <ulink url="http://tdb.samba.org/">tdb</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/samba4"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Samba</title>
+
+    <note>
+      <para>If you wish to run the test suite after the binaries are built,
+      you must add the <option>--enable-socket-wrapper</option> 
+      and <option>--enable-selftest</option> parameters to
+      the <command>configure</command> script below. You may want to run
+      <command>configure</command> with the <option>--help</option> parameter
+      first. There may be other parameters needed to take advantage of
+      optional dependencies.</para>
+    </note>
+
+    <para>Fix a build failure when building on a system with
+    <application>systemd</application> installed:</para>
+
+<screen><userinput>sed "s:systemd-daemon:systemd:g" -i wscript lib/util/wscript_build</userinput></screen>
+
+    <para>Install <application>Samba</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure                             \
+    --prefix=/usr                       \
+    --sysconfdir=/etc                   \
+    --localstatedir=/var                \
+    --with-piddir=/run/samba            \
+    --with-pammodulesdir=/lib/security  \
+    --enable-fhs                        \
+    --enable-nss-wrapper                &amp;&amp;
+
+make</userinput></screen>
+
+    <para>According to <application>Samba</application> developers, the
+    limitation to 108 characters of the path length of a unix named pipe socket
+    may be the cause of errors, so that over 1/3 of the tests might fail. For
+    this reason, the switch <option>--with-selftest-prefix=/tmp/quick</option>
+    (or another path with small number of characters) can be used with
+    configure. Even so, the 
+    <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
+    apparently for the same reason. If one quicktest fails, it can be disabled.
+    For example, <quote><replaceable>samba3.raw.eas</replaceable></quote> may
+    be disabled with the following command:</para>
+
+<screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>
+
+    <para>To test the results, as the <systemitem
+    class="username">root</systemitem> user, issue: <command>make
+    quicktest</command>.  There are other targets (test, subunit-test)
+    available, but take a very long time (over 100 SBU).</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+
+mv -v /usr/lib/libnss_win{s,bind}.so*   /lib                       &amp;&amp;
+ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so &amp;&amp;
+ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &amp;&amp;
+
+install -v -m644    examples/smb.conf.default /etc/samba &amp;&amp;
+
+mkdir -pv /etc/openldap/schema                        &amp;&amp;
+
+install -v -m644    examples/LDAP/README              \
+                    /etc/openldap/schema/README.LDAP  &amp;&amp;
+                    
+install -v -m644    examples/LDAP/samba*              \
+                    /etc/openldap/schema              &amp;&amp;
+                    
+install -v -m755    examples/LDAP/{get*,ol*} \
+                    /etc/openldap/schema              &amp;&amp;
+
+install -v -m755 -d /usr/share/doc/samba-&samba-version; &amp;&amp;
+
+install -v -m644    lib/ntdb/doc/design.pdf \
+                    /usr/share/doc/samba-&samba-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
+    a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>
+
+    <para><parameter>--enable-nss-wrapper</parameter>: Builds the nss-wrapper
+    library.</para>
+<!--
+    <para><option>-/-enable-socket-wrapper</option> and
+    <option>-/-enable-selftest</option>: These options are required to run
+    the test suite.</para>
+
+    <para><option>-/-with-selftest-prefix=SELFTEST_PREFIX</option>: This option
+    specify the test suite work directory (default=./st).</para>-->
+
+    <para><command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
+    The nss libraries are installed in /usr/lib by default. Move them to
+    /lib.</para>
+
+    <para><command>ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so</command>
+    and <command>ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so</command>:
+    These symlinks are required when applicates build against these libraries.</para>
+
+    <para><command>install -v -m644 examples/LDAP/* /etc/openldap/schema</command>:
+    These commands are used to copy sample Samba schemas to the OpenLDAP
+    <filename class='directory'>schema</filename> directory.</para>
+
+    <para><command>install -v -m644 ../examples/smb.conf.default
+    /etc/samba</command>: This copies a default <filename>smb.conf</filename>
+    file into <filename>/etc/samba</filename>. This sample configuration will
+    not work until you copy it to <filename>/etc/samba/smb.conf</filename> and
+    make the appropriate changes for your installation. See the configuration
+    section for minimum values which must be set.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Samba</title>
+
+    <sect3 id="samba-config">
+      <title>Config Files</title>
+
+      <para>/etc/samba/smb.conf</para>
+
+      <indexterm zone="samba samba-config">
+        <primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Printing to SMB Clients</title>
+
+      <para>If you use <application>CUPS</application> for print services,
+      and you wish to print to a printer attached to an SMB client, you
+      need to create an SMB backend device. To create the device, issue the
+      following command as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>Due to the complexity and the many various uses for
+      <application>Samba</application>, complete configuration for all the
+      package's capabilities is well beyond the scope of the BLFS book. This
+      section provides instructions to configure the
+      <filename>/etc/samba/smb.conf</filename> file for two common scenarios.
+      The complete contents of <filename>/etc/samba/smb.conf</filename> will
+      depend on the purpose of <application>Samba</application>
+      installation.</para>
+
+      <note>
+        <para>You may find it easier to copy the configuration parameters shown
+        below into an empty <filename>/etc/samba/smb.conf</filename> file
+        instead of copying and editing the default file as mentioned in the
+        <quote>Command Explanations</quote> section. How you create/edit the
+        <filename>/etc/samba/smb.conf</filename> file will be left up to
+        you. Do ensure the file is only writeable by the
+        <systemitem class="username">root</systemitem> user (mode 644).</para>
+      </note>
+
+      <sect4>
+        <title>Scenario 1: Minimal Standalone Client-Only Installation</title>
+
+        <para>Choose this variant if you only want to transfer files using
+        <command>smbclient</command>, mount Windows shares and print to Windows
+        printers, and don't want to share your files and printers to Windows
+        machines.</para>
+
+        <para>A <filename>/etc/samba/smb.conf</filename> file with the following
+        three parameters is sufficient:</para>
+
+<screen role='root'><literal>[global]
+    workgroup = <replaceable>MYGROUP</replaceable>
+    dos charset = <replaceable>cp850</replaceable>
+    unix charset = <replaceable>ISO-8859-1</replaceable></literal></screen>
+
+        <para>The values in this example specify that the computer belongs to a
+        Windows workgroup named
+        <quote><replaceable>MYGROUP</replaceable></quote>, uses the
+        <quote><replaceable>cp850</replaceable></quote> character set on the
+        wire when talking to MS-DOS and MS Windows 9x, and that the filenames
+        are stored in the <quote><replaceable>ISO-8859-1</replaceable></quote>
+        encoding on the disk. Adjust these values appropriately for your
+        installation. The <quote>unix charset</quote> value must be the same as
+        the output of <command>locale charmap</command> when executed with the
+        <envar>LANG</envar> variable set to your preferred locale, otherwise the
+        <command>ls</command> command may not display correct filenames of
+        downloaded files.</para>
+
+        <para>There is no need to run any <application>Samba</application>
+        servers in this scenario, thus you don't need to install the provided
+        bootscripts.</para>
+
+      </sect4>
+
+      <sect4>
+        <title>Scenario 2: Standalone File/Print Server</title>
+
+        <para>Choose this variant if you want to share your files and printers
+        to Windows machines in your workgroup in addition to the capabilities
+        described in Scenario 1.</para>
+
+        <para>In this case, the <filename>/etc/samba/smb.conf.default</filename>
+        file may be a good template to start from. Also add
+        <quote>dos charset</quote> and <quote>unix charset</quote> parameters
+        to the <quote>[global]</quote> section as described in Scenario 1 in
+        order to prevent filename corruption. For security reasons, you may
+        wish to define
+        <replaceable>path = /home/alice/shared-files</replaceable>,
+        assuming your user name is <replaceable>alice</replaceable> and you
+        only want to share the files in that directory, instead of your entire
+        home. Then, replace <replaceable>homes</replaceable> by
+        <replaceable>shared-files</replaceable> and change also the
+        <quote><literal>comment</literal></quote> if used the configuration
+        file below or the <filename>/etc/samba/smb.conf.default</filename>
+        to create yours.</para>
+
+        <para>The following configuration file creates a separate share for each
+        user's home directory and also makes all printers available to Windows
+        machines:</para>
+
+<screen role='root'><literal>[global]
+    workgroup = <replaceable>MYGROUP</replaceable>
+    dos charset = <replaceable>cp850</replaceable>
+    unix charset = <replaceable>ISO-8859-1</replaceable>
+
+[homes]
+    comment = Home Directories
+    browseable = no
+    writable = yes
+
+[printers]
+    comment = All Printers
+    path = /var/spool/samba
+    browseable = no
+    guest ok = no
+    printable = yes</literal></screen>
+
+        <para>Other parameters you may wish to customize in the
+        <quote>[global]</quote> section include:</para>
+
+<screen role='root'><literal>    server string =
+    security =
+    hosts allow =
+    load printers =
+    log file =
+    max log size =
+    socket options =
+    local master =</literal></screen>
+
+        <para>Reference the comments in the
+        <filename>/etc/samba/smb.conf.default</filename> file for information
+        regarding these parameters.</para>
+
+        <para>Since the <command>smbd</command> and <command>nmbd</command>
+        daemons are needed in this case, install the <filename>samba</filename>
+        bootscript. Be sure to run <command>smbpasswd</command> (with the
+        <option>-a</option> option to add users) to enable and
+        set passwords for all accounts that need
+        <application>Samba</application> access. Using the default
+        <application>Samba</application> passdb backend, any user you attempt
+        to add will also be required to exist in the
+        <filename>/etc/passwd</filename> file.</para>
+
+      </sect4>
+
+      <sect4>
+        <title>Advanced Requirements</title>
+
+        <para>More complex scenarios involving domain control or membership are
+        possible.  Such setups are advanced topics and cannot be adequately
+        covered in BLFS. Many complete books have been written on these topics
+        alone.  Note that in some domain membership scenarios, the
+        <command>winbindd</command> daemon and the corresponding bootscript are
+        needed.</para>
+
+        <para>There is quite a bit of documentation available which covers many
+        of these advanced configurations. Point your web browser to the links
+        below to view some of the documentation included with the
+        <application>Samba</application> package:</para>
+
+        <itemizedlist spacing='compact'>
+          <listitem>
+            <para>Using Samba, 2nd Edition; a popular book published by O'Reilly
+            <ulink url="http://www.samba.org/samba/docs/using_samba/toc.html"/></para>
+          </listitem>
+          <listitem>
+            <para>The Official Samba HOWTO and Reference Guide <ulink
+            url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"/>
+            </para>
+          </listitem>
+          <listitem>
+            <para>Samba-3 by Example
+            <ulink url="http://www.samba.org/samba/docs/man/Samba-Guide/"/>
+            </para>
+          </listitem>
+        </itemizedlist>
+
+      </sect4>
+
+      <sect4 id="samba-init">
+        <title>Systemd Units</title>
+
+        <para>The default <application>Samba</application> installation uses the
+        <systemitem class='username'>nobody</systemitem> user for guest access
+        to the server. This can be overridden by setting the
+        <option>guest account =</option> parameter in the
+        <filename>/etc/samba/smb.conf</filename> file. If you utilize the
+        <option>guest account =</option> parameter, ensure this user exists in
+        the <filename>/etc/passwd</filename> file. To use the default user,
+        issue the following commands as the
+        <systemitem class='username'>root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+    -s /bin/false -u 99 nobody</userinput></screen>
+
+        <para>
+          To start the <application>Samba</application> daemons at boot,
+          install the systemd units from the <xref linkend="bootscripts"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+        <indexterm zone="samba samba-init">
+          <primary sortas="f-samba">samba</primary>
+        </indexterm>
+
+<screen role="root"><userinput>make install-samba</userinput></screen>
+
+        <para>
+          To start the <command>winbindd</command> daemon at boot,
+          install the systemd unit from the <xref linkend="bootscripts"/>
+          package by running the following command as the
+          <systemitem class="username">root</systemitem> user:
+        </para>
+
+        <indexterm zone="samba samba-init">
+          <primary sortas="f-winbindd">winbindd</primary>
+        </indexterm>
+
+<screen role="root"><userinput>make install-winbindd</userinput></screen>
+
+        <note>
+          <para>
+            This package comes with two types of units: A service file and a socket file.
+            The service file will start smbd daemon once at boot and it will keep running until the
+            system shuts down. The socket file will make systemd listen on smbd port (Default 445, needs
+            to be edited for anything else) and will start smbd daemon when something tries to connect
+            to that port and stop the daemon when the connection is terminated. This is
+            called socket activation.
+
+            By default, the first method is used - smbd daemon is started at boot and stopped at shutdown.
+            If the socket method is desired, you need to run as the
+            <systemitem class="username">root</systemitem> user:
+
+<screen role="root"><userinput>systemctl stop smbd &amp;&amp;
+systemctl disable smbd &amp;&amp;
+systemctl enable smbd.socket &amp;&amp;
+systemctl start smbd.socket</userinput></screen>
+
+            Note that only smbd daemon can be socket activated.
+          </para>
+        </note>
+
+       </sect4>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+
+        <seg>cifsdd, dbwrap_tool, eventlogadm, gentest, ldbadd, ldbdel, ldbedit,
+        ldbmodify, ldbrename, ldbsearch, locktest, masktest, ndrdump, net, nmbd,
+        nmblookup, nmblookup4, ntdbbackup, ntdbdump, ntdbrestore, ntdbtool,
+        ntlm_auth, oLschema2ldif, pdbedit, pidl, profiles, regdiff, regpatch,
+        regshell, regtree, rpcclient, samba, samba_dnsupdate, samba_kcc,
+        samba-regedit, samba_spnupdate, samba-tool, samba_upgradedns, sharesec,
+        smbcacls, smbclient, smbclient4, smbcontrol, smbcquotas, smbd, smbget,
+        smbpasswd, smbspool, smbstatus, smbtar, smbta-util, smbtorture, smbtree,
+        tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo, and
+        winbindd</seg>
+
+        <seg>libdcerpc-atsvc.so, libdcerpc-binding.so, libdcerpc-samr.so,
+        libdcerpc-server.so, libdcerpc.so, libgensec.so, libndr-krb5pac.so,
+        libndr-nbt.so, libndr.so, libndr-standard.so, libnetapi.so,
+        libnss_winbind.so, libnss_wins.so, libpdb.so, libregistry.so,
+        libsamba-credentials.so, libsamba-hostconfig.so, libsamba-policy.so,
+        libsamba-util.so, libsamdb.so, libsmbclient-raw.so, libsmbclient.so,
+        libsmbconf.so, libsmbldap.so, libsmbsharemodes.so, libtevent-util.so,
+        libtorture.so, libwbclient.so, mit_samba.so, and
+        winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM
+        libraries; and assorted character set, filesystem and support modules
+        under /usr/lib/{python&python2-majorver;,samba}</seg>
+        
+        <seg>/etc/samba, /run/samba, /usr/include/samba-4.0,
+        /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/{Samba{3,4},Wireshark},
+        /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,
+        /usr/share/doc/samba-&samba-version;, /usr/share/samba, and
+        /var/{cache,lib,lock,log,run}/samba</seg>
+
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="eventlogadm">
+        <term><command>eventlogadm</command></term>
+        <listitem>
+          <para>is used to write records to eventlogs from STDIN, add the
+          specified source and DLL eventlog registry entries and display the
+          active eventlog names (from <filename>smb.conf</filename>).</para>
+          <indexterm zone="samba eventlogadm">
+            <primary sortas="b-eventlogadm">eventlogadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbadd">
+        <term><command>ldbadd</command></term>
+        <listitem>
+          <para>is a command-line utility for adding records to an LDB
+          database.</para>
+          <indexterm zone="samba ldbadd">
+            <primary sortas="b-ldbadd">ldbadd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbdel">
+        <term><command>ldbdel</command></term>
+        <listitem>
+          <para>is a command-line program for deleting LDB database
+          records.</para>
+          <indexterm zone="samba ldbdel">
+            <primary sortas="b-ldbdel">ldbdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbedit">
+        <term><command>ldbedit</command></term>
+        <listitem>
+          <para>allows you to edit LDB databases using your preferred
+          editor.</para>
+          <indexterm zone="samba ldbedit">
+            <primary sortas="b-ldbedit">ldbedit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbmodify">
+        <term><command>ldbmodify</command></term>
+        <listitem>
+          <para>allows you to modify records in an LDB database.</para>
+          <indexterm zone="samba ldbmodify">
+            <primary sortas="b-ldbmodify">ldbmodify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbrename">
+        <term><command>ldbrename</command></term>
+        <listitem>
+          <para>allows you to edit LDB databases using your preferred
+          editor.</para>
+          <indexterm zone="samba ldbrename">
+            <primary sortas="b-ldbrename">ldbrename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldbsearch">
+        <term><command>ldbsearch</command></term>
+        <listitem>
+          <para>searches an LDB database for records matching a specified
+          expression.</para>
+          <indexterm zone="samba ldbsearch">
+            <primary sortas="b-ldbsearch">ldbsearch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="net">
+        <term><command>net</command></term>
+        <listitem>
+          <para>is a tool for administration of
+          <application>Samba</application> and remote CIFS servers, similar
+          to the <command>net</command> utility for DOS/Windows.</para>
+          <indexterm zone="samba net">
+            <primary sortas="b-net">net</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nmbd">
+        <term><command>nmbd</command></term>
+        <listitem>
+          <para>is the <application>Samba</application>
+          NetBIOS name server.</para>
+          <indexterm zone="samba nmbd">
+            <primary sortas="b-nmbd">nmbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nmblookup">
+        <term><command>nmblookup</command></term>
+        <listitem>
+          <para>is used to query NetBIOS names and map
+          them to IP addresses.</para>
+          <indexterm zone="samba nmblookup">
+            <primary sortas="b-nmblookup">nmblookup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ntlm_auth">
+        <term><command>ntlm_auth</command></term>
+        <listitem>
+          <para>is a tool to allow external access to Winbind's
+          NTLM authentication function.</para>
+          <indexterm zone="samba ntlm_auth">
+            <primary sortas="b-ntlm_auth">ntlm_auth</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdbedit">
+        <term><command>pdbedit</command></term>
+        <listitem>
+          <para>is a tool used to manage the SAM database.</para>
+          <indexterm zone="samba pdbedit">
+            <primary sortas="b-pdbedit">pdbedit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="profiles">
+        <term><command>profiles</command></term>
+        <listitem>
+          <para>is a utility that reports and changes SIDs in Windows
+          registry files. It currently only supports Windows NT.</para>
+          <indexterm zone="samba profiles">
+            <primary sortas="b-profiles">profiles</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcclient">
+        <term><command>rpcclient</command></term>
+        <listitem>
+          <para>is used to execute MS-RPC client side functions.</para>
+          <indexterm zone="samba rpcclient">
+            <primary sortas="b-rpcclient">rpcclient</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sharesec">
+        <term><command>sharesec</command></term>
+        <listitem>
+          <para>manipulates share ACL permissions on SMB file shares.</para>
+          <indexterm zone="samba sharesec">
+            <primary sortas="b-sharesec">sharesec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbcacls">
+        <term><command>smbcacls</command></term>
+        <listitem>
+          <para>is used to manipulate Windows NT access control lists.</para>
+          <indexterm zone="samba smbcacls">
+            <primary sortas="b-smbcacls">smbcacls</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbclient">
+        <term><command>smbclient</command></term>
+        <listitem>
+          <para>is a SMB/CIFS access utility, similar to FTP.</para>
+          <indexterm zone="samba smbclient">
+            <primary sortas="b-smbclient">smbclient</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbcontrol">
+        <term><command>smbcontrol</command></term>
+        <listitem>
+          <para>is used to control running <command>smbd</command>,
+          <command>nmbd</command> and <command>winbindd</command>
+          daemons.</para>
+          <indexterm zone="samba smbcontrol">
+            <primary sortas="b-smbcontrol">smbcontrol</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbcquotas">
+        <term><command>smbcquotas</command></term>
+        <listitem>
+          <para>is used to manipulate Windows NT quotas on
+          SMB file shares.</para>
+          <indexterm zone="samba smbcquotas">
+            <primary sortas="b-smbcquotas">smbcquotas</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbd">
+        <term><command>smbd</command></term>
+        <listitem>
+          <para>is the main <application>Samba</application> daemon which
+          provides SMB/CIFS services to clients.</para>
+          <indexterm zone="samba smbd">
+            <primary sortas="b-smbd">smbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbget">
+        <term><command>smbget</command></term>
+        <listitem>
+          <para>is a simple utility with <command>wget</command>-like
+          semantics, that can download files from SMB servers. You can specify
+          the files you would like to download on the command-line.</para>
+          <indexterm zone="samba smbget">
+            <primary sortas="b-smbget">smbget</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbpasswd">
+        <term><command>smbpasswd</command></term>
+        <listitem>
+          <para>changes a user's <application>Samba</application>
+          password.</para>
+          <indexterm zone="samba smbpasswd">
+            <primary sortas="b-smbpasswd">smbpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbspool">
+        <term><command>smbspool</command></term>
+        <listitem>
+          <para>sends a print job to an SMB printer.</para>
+          <indexterm zone="samba smbspool">
+            <primary sortas="b-smbspool">smbspool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbstatus">
+        <term><command>smbstatus</command></term>
+        <listitem>
+          <para>reports current <application>Samba</application>
+          connections.</para>
+          <indexterm zone="samba smbstatus">
+            <primary sortas="b-smbstatus">smbstatus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbtar">
+        <term><command>smbtar</command></term>
+        <listitem>
+          <para>is a shell script used for backing up SMB/CIFS shares
+          directly to Linux tape drives or a file.</para>
+          <indexterm zone="samba smbtar">
+            <primary sortas="b-smbtar">smbtar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smbtree">
+        <term><command>smbtree</command></term>
+        <listitem>
+          <para>is a text-based SMB network browser.</para>
+          <indexterm zone="samba smbtree">
+            <primary sortas="b-smbtree">smbtree</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tdbbackup">
+        <term><command>tdbbackup</command></term>
+        <listitem>
+          <para>is a tool for backing up or validating the integrity of
+          <application>Samba</application> <filename>.tdb</filename>
+          files.</para>
+          <indexterm zone="samba tdbbackup">
+            <primary sortas="b-tdbbackup">tdbbackup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tdbdump">
+        <term><command>tdbdump</command></term>
+        <listitem>
+          <para> is a tool used to print the contents of a
+          <application>Samba</application> <filename>.tdb</filename>
+          file.</para>
+          <indexterm zone="samba tdbdump">
+            <primary sortas="b-tdbdump">tdbdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tdbtool">
+        <term><command>tdbtool</command></term>
+        <listitem>
+          <para>is a tool which allows simple database manipulation from the
+          command line.</para>
+          <indexterm zone="samba tdbtool">
+            <primary sortas="b-tdbtool">tdbtool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="testparm">
+        <term><command>testparm</command></term>
+        <listitem>
+          <para>checks an <filename>smb.conf</filename> file for proper
+          syntax.</para>
+          <indexterm zone="samba testparm">
+            <primary sortas="b-testparm">testparm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wbinfo">
+        <term><command>wbinfo</command></term>
+        <listitem>
+          <para>queries a running <command>winbindd</command> daemon.</para>
+          <indexterm zone="samba wbinfo">
+            <primary sortas="b-wbinfo">wbinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="winbindd">
+        <term><command>winbindd</command></term>
+        <listitem>
+          <para>resolves names from Windows NT servers.</para>
+          <indexterm zone="samba winbindd">
+            <primary sortas="b-winbindd">winbindd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnss_winbind">
+        <term><filename class='libraryfile'>libnss_winbind.so</filename></term>
+        <listitem>
+          <para>provides Name Service Switch API functions for resolving names
+          from NT servers.</para>
+          <indexterm zone="samba libnss_winbind">
+            <primary sortas="c-libnss_winbind">libnss_winbind.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnss_wins">
+        <term><filename class='libraryfile'>libnss_wins.so</filename></term>
+        <listitem>
+          <para>provides API functions for Samba's implementation of the
+          Windows Internet Naming Service.</para>
+          <indexterm zone="samba libnss_wins">
+            <primary sortas="c-libnss_wins">libnss_wins.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnetapi">
+        <term><filename class='libraryfile'>libnetapi.so</filename></term>
+        <listitem>
+          <para>provides the API functions for the administration tools used
+          for Samba and remote CIFS servers.</para>
+          <indexterm zone="samba libnetapi">
+            <primary sortas="c-libnetapi">libnetapi.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libsmbclient">
+        <term><filename class='libraryfile'>libsmbclient.so</filename></term>
+        <listitem>
+          <para>provides the API functions for the Samba SMB client tools.</para>
+          <indexterm zone="samba libsmbclient">
+            <primary sortas="c-libsmbclient">libsmbclient.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libsmbsharemodes">
+        <term><filename class='libraryfile'>libsmbsharemodes.so</filename></term>
+        <listitem>
+          <para>provides API functions for accessing SMB share modes
+          (locks etc.)</para>
+          <indexterm zone="samba libsmbsharemodes">
+            <primary sortas="c-libsmbsharemodes">libsmbsharemodes.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwbclient">
+        <term><filename class='libraryfile'>libwbclient.so</filename></term>
+        <listitem>
+          <para>provides API functions for Windows domain client services.</para>
+          <indexterm zone="samba libwbclient">
+            <primary sortas="c-libwbclient">libwbclient.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,920 +1,0 @@
-<?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 samba-download-http "http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
-  <!ENTITY samba-download-ftp  "ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
-  <!ENTITY samba-md5sum        "7ed2d4a181e55baa995eb8b58a9ad293">
-  <!ENTITY samba-size          "19 MB">
-  <!ENTITY samba-buildsize     "415 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "6.2 SBU (additional 5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
-]>
-
-<sect1 id="samba" xreflabel="Samba-&samba-version;">
-  <?dbhtml filename="samba.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Samba-&samba-version;</title>
-
-  <indexterm zone="samba">
-    <primary sortas="a-Samba">Samba</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Samba</title>
-
-    <para>The <application>Samba</application> package provides file and print
-    services to SMB/CIFS clients and Windows networking to Linux clients.
-    <application>Samba</application> can also be configured as a Windows Domain
-    Controller replacement, a file/print server acting as a member of a Windows
-    Active Directory domain and a NetBIOS (rfc1001/1002) nameserver (which
-    among other things provides LAN browsing support).</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&samba-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&samba-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &samba-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &samba-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &samba-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &samba-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Samba Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/> (for documentation)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libgpg-error"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="popt"/>,
-      <xref linkend="valgrind"/> (optionally used by the test suite),
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
-      <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
-      <ulink url="http://ftp.de.debian.org/debian/pool/main/liba/libaio/">libaio</ulink>,
-      <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
-      <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-      <ulink url="http://tdb.samba.org/">tdb</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/samba4"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Samba</title>
-
-    <note>
-      <para>If you wish to run the test suite after the binaries are built,
-      you must add the <option>-/-enable-socket-wrapper</option> 
-      and <option>-/-enable-selftest</option> parameters to
-      the <command>configure</command> script below. You may want to run
-      <command>configure</command> with the <option>-/-help</option> parameter
-      first. There may be other parameters needed to take advantage of
-      optional dependencies.</para>
-    </note>
-
-    <para>Install <application>Samba</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure                             \
-    --prefix=/usr                       \
-    --sysconfdir=/etc                   \
-    --localstatedir=/var                \
-    --with-piddir=/run/samba            \
-    --with-pammodulesdir=/lib/security  \
-    --without-systemd                   \
-    --enable-fhs                        \
-    --enable-nss-wrapper                &amp;&amp;
-
-make</userinput></screen>
-
-    <para>According to <application>Samba</application> developers, the
-    limitation to 108 characters of the path length of a unix named pipe socket
-    may be the cause of errors, so that over 1/3 of the tests might fail. For
-    this reason, the switch <option>-/-with-selftest-prefix=/tmp/quick</option>
-    (or another path with small number of characters) can be used with
-    configure. Even so, the 
-    <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
-    apparently for the same reason. If one quicktest fails, it can be disabled.
-    For example, <quote><replaceable>samba3.raw.eas</replaceable></quote> may
-    be disabled with the following command:</para>
-
-<screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>
-
-    <para>To test the results, as the <systemitem
-    class="username">root</systemitem> user, issue: <command>make
-    quicktest</command>.  There are other targets (test, subunit-test)
-    available, but take a very long time (over 100 SBU).</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-mv -v /usr/lib/libnss_win{s,bind}.so*   /lib                       &amp;&amp;
-ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so &amp;&amp;
-ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so    &amp;&amp;
-
-install -v -m644    examples/smb.conf.default /etc/samba &amp;&amp;
-
-mkdir -pv /etc/openldap/schema                        &amp;&amp;
-
-install -v -m644    examples/LDAP/README              \
-                    /etc/openldap/schema/README.LDAP  &amp;&amp;
-                    
-install -v -m644    examples/LDAP/samba*              \
-                    /etc/openldap/schema              &amp;&amp;
-                    
-install -v -m755    examples/LDAP/{get*,ol*} \
-                    /etc/openldap/schema              &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/samba-&samba-version; &amp;&amp;
-
-install -v -m644    lib/ntdb/doc/design.pdf \
-                    /usr/share/doc/samba-&samba-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
-    a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>
-
-    <para><parameter>--enable-nss-wrapper</parameter>: Builds the nss-wrapper
-    library.</para>
-
-    <para><parameter>--without-systemd</parameter>: Disable
-    <application>systemd</application> integration, which is not part of
-    LFS/BLFS. If you use <application>systemd</application>, replace by
-    <parameter>--with-systemd</parameter>.</para>
-<!--
-    <para><option>-/-enable-socket-wrapper</option> and
-    <option>-/-enable-selftest</option>: These options are required to run
-    the test suite.</para>
-
-    <para><option>-/-with-selftest-prefix=SELFTEST_PREFIX</option>: This option
-    specify the test suite work directory (default=./st).</para>-->
-
-    <para><command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
-    The nss libraries are installed in /usr/lib by default. Move them to
-    /lib.</para>
-
-    <para><command>ln -v -sf ../../lib/libnss_winbind.so.2 /usr/lib/libnss_winbind.so</command>
-    and <command>ln -v -sf ../../lib/libnss_wins.so.2    /usr/lib/libnss_wins.so</command>:
-    These symlinks are required when applicates build against these libraries.</para>
-
-    <para><command>install -v -m644 examples/LDAP/* /etc/openldap/schema</command>:
-    These commands are used to copy sample Samba schemas to the OpenLDAP
-    <filename class='directory'>schema</filename> directory.</para>
-
-    <para><command>install -v -m644 ../examples/smb.conf.default
-    /etc/samba</command>: This copies a default <filename>smb.conf</filename>
-    file into <filename>/etc/samba</filename>. This sample configuration will
-    not work until you copy it to <filename>/etc/samba/smb.conf</filename> and
-    make the appropriate changes for your installation. See the configuration
-    section for minimum values which must be set.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Samba</title>
-
-    <sect3 id="samba-config">
-      <title>Config Files</title>
-
-      <para>/etc/samba/smb.conf</para>
-
-      <indexterm zone="samba samba-config">
-        <primary sortas="e-etc-samba-smb.conf">/etc/samba/smb.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Printing to SMB Clients</title>
-
-      <para>If you use <application>CUPS</application> for print services,
-      and you wish to print to a printer attached to an SMB client, you
-      need to create an SMB backend device. To create the device, issue the
-      following command as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Due to the complexity and the many various uses for
-      <application>Samba</application>, complete configuration for all the
-      package's capabilities is well beyond the scope of the BLFS book. This
-      section provides instructions to configure the
-      <filename>/etc/samba/smb.conf</filename> file for two common scenarios.
-      The complete contents of <filename>/etc/samba/smb.conf</filename> will
-      depend on the purpose of <application>Samba</application>
-      installation.</para>
-
-      <note>
-        <para>You may find it easier to copy the configuration parameters shown
-        below into an empty <filename>/etc/samba/smb.conf</filename> file
-        instead of copying and editing the default file as mentioned in the
-        <quote>Command Explanations</quote> section. How you create/edit the
-        <filename>/etc/samba/smb.conf</filename> file will be left up to
-        you. Do ensure the file is only writeable by the
-        <systemitem class="username">root</systemitem> user (mode 644).</para>
-      </note>
-
-      <sect4>
-        <title>Scenario 1: Minimal Standalone Client-Only Installation</title>
-
-        <para>Choose this variant if you only want to transfer files using
-        <command>smbclient</command>, mount Windows shares and print to Windows
-        printers, and don't want to share your files and printers to Windows
-        machines.</para>
-
-        <para>A <filename>/etc/samba/smb.conf</filename> file with the following
-        three parameters is sufficient:</para>
-
-<screen role='root'><literal>[global]
-    workgroup = <replaceable>MYGROUP</replaceable>
-    dos charset = <replaceable>cp850</replaceable>
-    unix charset = <replaceable>ISO-8859-1</replaceable></literal></screen>
-
-        <para>The values in this example specify that the computer belongs to a
-        Windows workgroup named
-        <quote><replaceable>MYGROUP</replaceable></quote>, uses the
-        <quote><replaceable>cp850</replaceable></quote> character set on the
-        wire when talking to MS-DOS and MS Windows 9x, and that the filenames
-        are stored in the <quote><replaceable>ISO-8859-1</replaceable></quote>
-        encoding on the disk. Adjust these values appropriately for your
-        installation. The <quote>unix charset</quote> value must be the same as
-        the output of <command>locale charmap</command> when executed with the
-        <envar>LANG</envar> variable set to your preferred locale, otherwise the
-        <command>ls</command> command may not display correct filenames of
-        downloaded files.</para>
-
-        <para>There is no need to run any <application>Samba</application>
-        servers in this scenario, thus you don't need to install the provided
-        bootscripts.</para>
-
-      </sect4>
-
-      <sect4>
-        <title>Scenario 2: Standalone File/Print Server</title>
-
-        <para>Choose this variant if you want to share your files and printers
-        to Windows machines in your workgroup in addition to the capabilities
-        described in Scenario 1.</para>
-
-        <para>In this case, the <filename>/etc/samba/smb.conf.default</filename>
-        file may be a good template to start from. Also add
-        <quote>dos charset</quote> and <quote>unix charset</quote> parameters
-        to the <quote>[global]</quote> section as described in Scenario 1 in
-        order to prevent filename corruption. For security reasons, you may
-        wish to define
-        <replaceable>path = /home/alice/shared-files</replaceable>,
-        assuming your user name is <replaceable>alice</replaceable> and you
-        only want to share the files in that directory, instead of your entire
-        home. Then, replace <replaceable>homes</replaceable> by
-        <replaceable>shared-files</replaceable> and change also the
-        <quote><literal>comment</literal></quote> if used the configuration
-        file below or the <filename>/etc/samba/smb.conf.default</filename>
-        to create yours.</para>
-
-        <para>The following configuration file creates a separate share for each
-        user's home directory and also makes all printers available to Windows
-        machines:</para>
-
-<screen role='root'><literal>[global]
-    workgroup = <replaceable>MYGROUP</replaceable>
-    dos charset = <replaceable>cp850</replaceable>
-    unix charset = <replaceable>ISO-8859-1</replaceable>
-
-[homes]
-    comment = Home Directories
-    browseable = no
-    writable = yes
-
-[printers]
-    comment = All Printers
-    path = /var/spool/samba
-    browseable = no
-    guest ok = no
-    printable = yes</literal></screen>
-
-        <para>Other parameters you may wish to customize in the
-        <quote>[global]</quote> section include:</para>
-
-<screen role='root'><literal>    server string =
-    security =
-    hosts allow =
-    load printers =
-    log file =
-    max log size =
-    socket options =
-    local master =</literal></screen>
-
-        <para>Reference the comments in the
-        <filename>/etc/samba/smb.conf.default</filename> file for information
-        regarding these parameters.</para>
-
-        <para>Since the <command>smbd</command> and <command>nmbd</command>
-        daemons are needed in this case, install the <filename>samba</filename>
-        bootscript. Be sure to run <command>smbpasswd</command> (with the
-        <option>-a</option> option to add users) to enable and
-        set passwords for all accounts that need
-        <application>Samba</application> access. Using the default
-        <application>Samba</application> passdb backend, any user you attempt
-        to add will also be required to exist in the
-        <filename>/etc/passwd</filename> file.</para>
-
-      </sect4>
-
-      <sect4>
-        <title>Advanced Requirements</title>
-
-        <para>More complex scenarios involving domain control or membership are
-        possible.  Such setups are advanced topics and cannot be adequately
-        covered in BLFS. Many complete books have been written on these topics
-        alone.  Note that in some domain membership scenarios, the
-        <command>winbindd</command> daemon and the corresponding bootscript are
-        needed.</para>
-
-        <para>There is quite a bit of documentation available which covers many
-        of these advanced configurations. Point your web browser to the links
-        below to view some of the documentation included with the
-        <application>Samba</application> package:</para>
-
-        <itemizedlist spacing='compact'>
-          <listitem>
-            <para>Using Samba, 2nd Edition; a popular book published by O'Reilly
-            <ulink url="http://www.samba.org/samba/docs/using_samba/toc.html"/></para>
-          </listitem>
-          <listitem>
-            <para>The Official Samba HOWTO and Reference Guide <ulink
-            url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>Samba-3 by Example
-            <ulink url="http://www.samba.org/samba/docs/man/Samba-Guide/"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-
-      </sect4>
-
-      <sect4 id="samba-init">
-        <title>Boot Script</title>
-
-        <para>For your convenience, boot scripts have been provided for
-        <application>Samba</application>. There are two included in the
-        <xref linkend="bootscripts"/> package. The first,
-        <filename>samba</filename>, will start the <command>smbd</command>
-        and <command>nmbd</command> daemons needed to provide SMB/CIFS
-        services. The second script, <filename>winbind</filename>, starts
-        the <command>winbindd</command> daemon, used for providing Windows
-        domain services to Linux clients.</para>
-
-        <indexterm zone="samba samba-init">
-          <primary sortas="f-samba">samba</primary>
-        </indexterm>
-
-        <indexterm zone="samba samba-init">
-          <primary sortas="f-winbind">winbind</primary>
-        </indexterm>
-
-        <para>The default <application>Samba</application> installation uses the
-        <systemitem class='username'>nobody</systemitem> user for guest access
-        to the server. This can be overridden by setting the
-        <option>guest account =</option> parameter in the
-        <filename>/etc/samba/smb.conf</filename> file. If you utilize the
-        <option>guest account =</option> parameter, ensure this user exists in
-        the <filename>/etc/passwd</filename> file. To use the default user,
-        issue the following commands as the
-        <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
-useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
-    -s /bin/false -u 99 nobody</userinput></screen>
-
-        <para>Install the <filename>samba</filename> script with the following
-        command issued as the <systemitem class="username">root</systemitem>
-        user:</para>
-
-<screen role="root"><userinput>make install-samba</userinput></screen>
-
-        <para>If you also need the <filename>winbindd</filename>
-        script to resolve names from Windows clients, run:</para>
-
-<screen role="root"><userinput>make install-winbindd</userinput></screen>
-
-       </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>cifsdd, dbwrap_tool, eventlogadm, gentest, ldbadd, ldbdel, ldbedit,
-        ldbmodify, ldbrename, ldbsearch, locktest, masktest, ndrdump, net, nmbd,
-        nmblookup, nmblookup4, ntdbbackup, ntdbdump, ntdbrestore, ntdbtool,
-        ntlm_auth, oLschema2ldif, pdbedit, pidl, profiles, regdiff, regpatch,
-        regshell, regtree, rpcclient, samba, samba_dnsupdate, samba_kcc,
-        samba-regedit, samba_spnupdate, samba-tool, samba_upgradedns, sharesec,
-        smbcacls, smbclient, smbclient4, smbcontrol, smbcquotas, smbd, smbget,
-        smbpasswd, smbspool, smbstatus, smbtar, smbta-util, smbtorture, smbtree,
-        tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo, and
-        winbindd</seg>
-
-        <seg>libdcerpc-atsvc.so, libdcerpc-binding.so, libdcerpc-samr.so,
-        libdcerpc-server.so, libdcerpc.so, libgensec.so, libndr-krb5pac.so,
-        libndr-nbt.so, libndr.so, libndr-standard.so, libnetapi.so,
-        libnss_winbind.so, libnss_wins.so, libpdb.so, libregistry.so,
-        libsamba-credentials.so, libsamba-hostconfig.so, libsamba-policy.so,
-        libsamba-util.so, libsamdb.so, libsmbclient-raw.so, libsmbclient.so,
-        libsmbconf.so, libsmbldap.so, libsmbsharemodes.so, libtevent-util.so,
-        libtorture.so, libwbclient.so, mit_samba.so, and
-        winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM
-        libraries; and assorted character set, filesystem and support modules
-        under /usr/lib/{python&python2-majorver;,samba}</seg>
-        
-        <seg>/etc/samba, /run/samba, /usr/include/samba-4.0,
-        /usr/lib/perl5/vendor_perl/5.x.y/Parse/Pidl/{Samba{3,4},Wireshark},
-        /usr/lib/python&python2-majorver;/site-packages/samba, /usr/lib/samba,
-        /usr/share/doc/samba-&samba-version;, /usr/share/samba, and
-        /var/{cache,lib,lock,log,run}/samba</seg>
-
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="eventlogadm">
-        <term><command>eventlogadm</command></term>
-        <listitem>
-          <para>is used to write records to eventlogs from STDIN, add the
-          specified source and DLL eventlog registry entries and display the
-          active eventlog names (from <filename>smb.conf</filename>).</para>
-          <indexterm zone="samba eventlogadm">
-            <primary sortas="b-eventlogadm">eventlogadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbadd">
-        <term><command>ldbadd</command></term>
-        <listitem>
-          <para>is a command-line utility for adding records to an LDB
-          database.</para>
-          <indexterm zone="samba ldbadd">
-            <primary sortas="b-ldbadd">ldbadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbdel">
-        <term><command>ldbdel</command></term>
-        <listitem>
-          <para>is a command-line program for deleting LDB database
-          records.</para>
-          <indexterm zone="samba ldbdel">
-            <primary sortas="b-ldbdel">ldbdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbedit">
-        <term><command>ldbedit</command></term>
-        <listitem>
-          <para>allows you to edit LDB databases using your preferred
-          editor.</para>
-          <indexterm zone="samba ldbedit">
-            <primary sortas="b-ldbedit">ldbedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbmodify">
-        <term><command>ldbmodify</command></term>
-        <listitem>
-          <para>allows you to modify records in an LDB database.</para>
-          <indexterm zone="samba ldbmodify">
-            <primary sortas="b-ldbmodify">ldbmodify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbrename">
-        <term><command>ldbrename</command></term>
-        <listitem>
-          <para>allows you to edit LDB databases using your preferred
-          editor.</para>
-          <indexterm zone="samba ldbrename">
-            <primary sortas="b-ldbrename">ldbrename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldbsearch">
-        <term><command>ldbsearch</command></term>
-        <listitem>
-          <para>searches an LDB database for records matching a specified
-          expression.</para>
-          <indexterm zone="samba ldbsearch">
-            <primary sortas="b-ldbsearch">ldbsearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="net">
-        <term><command>net</command></term>
-        <listitem>
-          <para>is a tool for administration of
-          <application>Samba</application> and remote CIFS servers, similar
-          to the <command>net</command> utility for DOS/Windows.</para>
-          <indexterm zone="samba net">
-            <primary sortas="b-net">net</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmbd">
-        <term><command>nmbd</command></term>
-        <listitem>
-          <para>is the <application>Samba</application>
-          NetBIOS name server.</para>
-          <indexterm zone="samba nmbd">
-            <primary sortas="b-nmbd">nmbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nmblookup">
-        <term><command>nmblookup</command></term>
-        <listitem>
-          <para>is used to query NetBIOS names and map
-          them to IP addresses.</para>
-          <indexterm zone="samba nmblookup">
-            <primary sortas="b-nmblookup">nmblookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ntlm_auth">
-        <term><command>ntlm_auth</command></term>
-        <listitem>
-          <para>is a tool to allow external access to Winbind's
-          NTLM authentication function.</para>
-          <indexterm zone="samba ntlm_auth">
-            <primary sortas="b-ntlm_auth">ntlm_auth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdbedit">
-        <term><command>pdbedit</command></term>
-        <listitem>
-          <para>is a tool used to manage the SAM database.</para>
-          <indexterm zone="samba pdbedit">
-            <primary sortas="b-pdbedit">pdbedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="profiles">
-        <term><command>profiles</command></term>
-        <listitem>
-          <para>is a utility that reports and changes SIDs in Windows
-          registry files. It currently only supports Windows NT.</para>
-          <indexterm zone="samba profiles">
-            <primary sortas="b-profiles">profiles</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcclient">
-        <term><command>rpcclient</command></term>
-        <listitem>
-          <para>is used to execute MS-RPC client side functions.</para>
-          <indexterm zone="samba rpcclient">
-            <primary sortas="b-rpcclient">rpcclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sharesec">
-        <term><command>sharesec</command></term>
-        <listitem>
-          <para>manipulates share ACL permissions on SMB file shares.</para>
-          <indexterm zone="samba sharesec">
-            <primary sortas="b-sharesec">sharesec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcacls">
-        <term><command>smbcacls</command></term>
-        <listitem>
-          <para>is used to manipulate Windows NT access control lists.</para>
-          <indexterm zone="samba smbcacls">
-            <primary sortas="b-smbcacls">smbcacls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbclient">
-        <term><command>smbclient</command></term>
-        <listitem>
-          <para>is a SMB/CIFS access utility, similar to FTP.</para>
-          <indexterm zone="samba smbclient">
-            <primary sortas="b-smbclient">smbclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcontrol">
-        <term><command>smbcontrol</command></term>
-        <listitem>
-          <para>is used to control running <command>smbd</command>,
-          <command>nmbd</command> and <command>winbindd</command>
-          daemons.</para>
-          <indexterm zone="samba smbcontrol">
-            <primary sortas="b-smbcontrol">smbcontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbcquotas">
-        <term><command>smbcquotas</command></term>
-        <listitem>
-          <para>is used to manipulate Windows NT quotas on
-          SMB file shares.</para>
-          <indexterm zone="samba smbcquotas">
-            <primary sortas="b-smbcquotas">smbcquotas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbd">
-        <term><command>smbd</command></term>
-        <listitem>
-          <para>is the main <application>Samba</application> daemon which
-          provides SMB/CIFS services to clients.</para>
-          <indexterm zone="samba smbd">
-            <primary sortas="b-smbd">smbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbget">
-        <term><command>smbget</command></term>
-        <listitem>
-          <para>is a simple utility with <command>wget</command>-like
-          semantics, that can download files from SMB servers. You can specify
-          the files you would like to download on the command-line.</para>
-          <indexterm zone="samba smbget">
-            <primary sortas="b-smbget">smbget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbpasswd">
-        <term><command>smbpasswd</command></term>
-        <listitem>
-          <para>changes a user's <application>Samba</application>
-          password.</para>
-          <indexterm zone="samba smbpasswd">
-            <primary sortas="b-smbpasswd">smbpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbspool">
-        <term><command>smbspool</command></term>
-        <listitem>
-          <para>sends a print job to an SMB printer.</para>
-          <indexterm zone="samba smbspool">
-            <primary sortas="b-smbspool">smbspool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbstatus">
-        <term><command>smbstatus</command></term>
-        <listitem>
-          <para>reports current <application>Samba</application>
-          connections.</para>
-          <indexterm zone="samba smbstatus">
-            <primary sortas="b-smbstatus">smbstatus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbtar">
-        <term><command>smbtar</command></term>
-        <listitem>
-          <para>is a shell script used for backing up SMB/CIFS shares
-          directly to Linux tape drives or a file.</para>
-          <indexterm zone="samba smbtar">
-            <primary sortas="b-smbtar">smbtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smbtree">
-        <term><command>smbtree</command></term>
-        <listitem>
-          <para>is a text-based SMB network browser.</para>
-          <indexterm zone="samba smbtree">
-            <primary sortas="b-smbtree">smbtree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbbackup">
-        <term><command>tdbbackup</command></term>
-        <listitem>
-          <para>is a tool for backing up or validating the integrity of
-          <application>Samba</application> <filename>.tdb</filename>
-          files.</para>
-          <indexterm zone="samba tdbbackup">
-            <primary sortas="b-tdbbackup">tdbbackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbdump">
-        <term><command>tdbdump</command></term>
-        <listitem>
-          <para> is a tool used to print the contents of a
-          <application>Samba</application> <filename>.tdb</filename>
-          file.</para>
-          <indexterm zone="samba tdbdump">
-            <primary sortas="b-tdbdump">tdbdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tdbtool">
-        <term><command>tdbtool</command></term>
-        <listitem>
-          <para>is a tool which allows simple database manipulation from the
-          command line.</para>
-          <indexterm zone="samba tdbtool">
-            <primary sortas="b-tdbtool">tdbtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="testparm">
-        <term><command>testparm</command></term>
-        <listitem>
-          <para>checks an <filename>smb.conf</filename> file for proper
-          syntax.</para>
-          <indexterm zone="samba testparm">
-            <primary sortas="b-testparm">testparm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wbinfo">
-        <term><command>wbinfo</command></term>
-        <listitem>
-          <para>queries a running <command>winbindd</command> daemon.</para>
-          <indexterm zone="samba wbinfo">
-            <primary sortas="b-wbinfo">wbinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="winbindd">
-        <term><command>winbindd</command></term>
-        <listitem>
-          <para>resolves names from Windows NT servers.</para>
-          <indexterm zone="samba winbindd">
-            <primary sortas="b-winbindd">winbindd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss_winbind">
-        <term><filename class='libraryfile'>libnss_winbind.so</filename></term>
-        <listitem>
-          <para>provides Name Service Switch API functions for resolving names
-          from NT servers.</para>
-          <indexterm zone="samba libnss_winbind">
-            <primary sortas="c-libnss_winbind">libnss_winbind.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss_wins">
-        <term><filename class='libraryfile'>libnss_wins.so</filename></term>
-        <listitem>
-          <para>provides API functions for Samba's implementation of the
-          Windows Internet Naming Service.</para>
-          <indexterm zone="samba libnss_wins">
-            <primary sortas="c-libnss_wins">libnss_wins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnetapi">
-        <term><filename class='libraryfile'>libnetapi.so</filename></term>
-        <listitem>
-          <para>provides the API functions for the administration tools used
-          for Samba and remote CIFS servers.</para>
-          <indexterm zone="samba libnetapi">
-            <primary sortas="c-libnetapi">libnetapi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsmbclient">
-        <term><filename class='libraryfile'>libsmbclient.so</filename></term>
-        <listitem>
-          <para>provides the API functions for the Samba SMB client tools.</para>
-          <indexterm zone="samba libsmbclient">
-            <primary sortas="c-libsmbclient">libsmbclient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsmbsharemodes">
-        <term><filename class='libraryfile'>libsmbsharemodes.so</filename></term>
-        <listitem>
-          <para>provides API functions for accessing SMB share modes
-          (locks etc.)</para>
-          <indexterm zone="samba libsmbsharemodes">
-            <primary sortas="c-libsmbsharemodes">libsmbsharemodes.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwbclient">
-        <term><filename class='libraryfile'>libwbclient.so</filename></term>
-        <listitem>
-          <para>provides API functions for Windows domain client services.</para>
-          <indexterm zone="samba libwbclient">
-            <primary sortas="c-libwbclient">libwbclient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/wpa_supplicant-systemd.xml
===================================================================
--- networking/netprogs/wpa_supplicant-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
+++ networking/netprogs/wpa_supplicant-systemd.xml	(revision dec19e939ee26ab000432f3d6c00d713539b2efe)
@@ -0,0 +1,492 @@
+<?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 wpa_supplicant-download-http
+           "http://hostap.epitest.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
+  <!ENTITY wpa_supplicant-download-ftp  " ">
+  <!ENTITY wpa_supplicant-md5sum        "f2ed8fef72cf63d8d446a2d0a6da630a">
+  <!ENTITY wpa_supplicant-size          "2.3 MB">
+  <!ENTITY wpa_supplicant-buildsize     "30 MB">
+  <!ENTITY wpa_supplicant-time          "0.4 SBU">
+]>
+
+<sect1 id="wpa_supplicant" xreflabel="wpa_supplicant-&wpa_supplicant-version;">
+  <?dbhtml filename="wpa_supplicant.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>wpa_supplicant-&wpa_supplicant-version;</title>
+
+  <indexterm zone="wpa_supplicant">
+    <primary sortas="a-wpa_supplicant">wpa_supplicant</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to WPA Supplicant</title>
+
+    <para>
+      <application>WPA Supplicant</application> is a Wi-Fi Protected Access
+      (WPA) client and IEEE 802.1X supplicant. It implements WPA key negotiation
+      with a WPA Authenticator and Extensible Authentication Protocol (EAP)
+      authentication with an Authentication Server. In addition, it controls the
+      roaming and IEEE 802.11 authentication/association of the wireless LAN
+      driver. This is useful for connecting to a password protected wireless
+      access point.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&wpa_supplicant-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&wpa_supplicant-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &wpa_supplicant-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &wpa_supplicant-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &wpa_supplicant-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &wpa_supplicant-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">WPA Supplicant Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnl"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="qt4"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/wpa_supplicant"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="kernel" id="wpa_supplicant-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration as well as
+      specific device drivers for your hardware and recompile the kernel if
+      necessary:
+    </para>
+
+<screen><literal>Networking support  --->                   [CONFIG_NET]
+  Wireless  --->                                            [CONFIG_WIRELESS]
+    cfg80211 - wireless configuration API: Y or M           [CONFIG_CFG80211]
+      cfg80211 wireless extensions compatibility: Y         [CONFIG_CFG80211_WEXT]
+    Generic IEEE 802.11 Networking Stack (mac80211): Y or M [CONFIG_MAC80211]
+Device Drivers  --->
+  Network device support  --->                              [CONFIG_NETDEVICES}
+    Wireless LAN  --->                                      [CONFIG_WLAN]</literal></screen>
+
+    <para>
+      Select the options that support your hardware:
+      <command>lspci</command> from <xref linkend="pciutils"/> can be used to
+      view your hardware configuration.
+    </para>
+
+    <indexterm zone="wpa_supplicant wpa_supplicant-kernel">
+      <primary sortas="d-wpa_supplicant">wpa_supplicant</primary>
+    </indexterm>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of WPA Supplicant</title>
+
+    <para>
+      First you will need to create an initial configuration file for the
+      build process. You can read <filename>wpa_supplicant/README</filename>
+      and <filename>wpa_supplicant/defconfig</filename> for the explanation
+      of the following options as well as other options that can be used.
+      Create a build configuration file that should work for standard WiFi
+      setups by running the following command:
+    </para>
+
+<screen><userinput>cat &gt; wpa_supplicant/.config &lt;&lt; "EOF"
+<literal>CONFIG_BACKEND=file
+CONFIG_CTRL_IFACE=y
+CONFIG_DEBUG_FILE=y
+CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_TTLS=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_IPV6=y
+CONFIG_LIBNL32=y
+CONFIG_PEERKEY=y
+CONFIG_PKCS12=y
+CONFIG_READLINE=y
+CONFIG_SMARTCARD=y
+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"/>, add the required 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
+CONFIG_CTRL_IFACE_DBUS_INTRO=y</literal>
+EOF</userinput></screen>
+
+    <para>
+      First, fix expand the list of parameters that are passed to the
+      <command>wpa_supplicant</command> when started as a
+      <application>D-Bus</application> service:
+    </para>
+
+<screen><userinput>sed -e "s@wpa_supplicant -u@&amp; -s -O /var/run/wpa_supplicant@g" -i wpa_supplicant/dbus/*.service.in &amp;&amp;
+sed -e "s@wpa_supplicant -u@&amp; -s -O /var/run/wpa_supplicant@g" -i wpa_supplicant/systemd/wpa_supplicant.service.in</userinput></screen>
+
+    <para>
+      Install <application>WPA Supplicant</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>cd wpa_supplicant &amp;&amp;
+make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
+
+    <para>
+      If you have installed <xref linkend="qt4"/> and wish to build
+      the <application>WPA Supplicant</application> GUI program, run
+      the following commands:
+    </para>
+
+<screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
+qmake-qt4 wpa_gui.pro &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /sbin/ &amp;&amp;
+install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5/ &amp;&amp;
+install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/</userinput></screen>
+
+    <para>
+      Install the <application>systemd</application> support files by
+      running the following command as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 systemd/*.service /lib/systemd/system/</userinput></screen>
+
+    <para>
+      If you have built <application>WPA Supplicant</application> with
+      <application>D-Bus</application> support, you will need to install
+      <application>D-Bus</application> configuration files. Install them
+      by running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
+                 /usr/share/dbus-1/system-services/ &amp;&amp;
+install -v -m644 dbus/dbus-wpa_supplicant.conf \
+                 /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
+
+    <para>
+      Additionally, enable the <filename>wpa_supplicant.service</filename> so that
+      <application>systemd</application> can properly activate the
+      <application>D-Bus</application> service. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>systemctl enable wpa_supplicant</userinput></screen>
+
+    <para>
+      If you have built the <application>WPA Supplicant</application> GUI
+      program, install it by running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 wpa_gui-qt4/wpa_gui /usr/bin/ &amp;&amp;
+install -v -m644 doc/docbook/wpa_gui.8 /usr/share/man/man8/ &amp;&amp;
+install -v -m644 wpa_gui-qt4/wpa_gui.desktop /usr/share/applications/ &amp;&amp;
+install -v -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/</userinput></screen>
+
+    <note>
+      <para>
+        You will need to restart the system <application>D-Bus</application> daemon
+        before you can use the <application>WPA Supplicant</application>
+        <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">
+    <title>Configuring wpa_supplicant</title>
+
+    <sect3 id="wpa_supplicant-config">
+      <title>Config File</title>
+
+      <para>
+        <filename>/etc/wpa_supplicant/wpa_supplicant-*.conf</filename>
+      </para>
+
+      <indexterm zone="wpa_supplicant wpa_supplicant-config">
+        <primary
+        sortas="e-etc-wpa_supplicant-wpa_supplicant-star.conf">/etc/wpa_supplicant/wpa_supplicant-*.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <warning>
+        <para>
+          You need to replace <replaceable>wlan0</replaceable> with
+          the correct wireless interface name in the commands below.
+        </para>
+      </warning>
+
+      <para>
+        To connect to an access point that uses a password, you need to put
+        the pre-shared key in <filename>
+        /etc/wpa_supplicant/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</filename>.
+        SSID is the string that the access point/router transmits to
+        identify itself. Run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -dm755 /etc/wpa_supplicant &amp;&amp;
+wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/wpa_supplicant/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</userinput></screen>
+
+      <para>
+        <filename>/etc/wpa_supplicant/wpa_supplicant-<replaceable>wlan0</replaceable>.conf
+        </filename> can hold the details of several access points. When
+        <command>wpa_supplicant</command> is started, it will scan for the
+        SSIDs it can see and choose the appropriate password to connect.
+        </para>
+
+      <para>
+        If you want to connect to an access point that isn't password
+        protected, put an entry like this in <filename>
+        /etc/wpa_supplicant/wpa_supplicant-<replaceable>wlan0</replaceable>.conf</filename>.
+        Replace "Some-SSID" with the SSID of the access point/router.
+      </para>
+
+<screen>network={
+  ssid="<replaceable>Some-SSID</replaceable>"
+  key_mgmt=NONE
+}</screen>
+
+      <para>
+        There are many options that you could use to tweak how you connect
+        to each access point. They are described in some detail in the
+        <filename>wpa_supplicant/wpa_supplicant.conf</filename> file in the
+        source tree.
+      </para>
+
+    </sect3>
+
+    <sect3>
+      <title>Connecting to an Access Point</title>
+
+      <para>
+        There are 3 types of <application>systemd</application> units
+        that were installed:
+      </para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            wpa_supplicant@.service
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            wpa_supplicant-nl80211@.service
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            wpa_supplicant-wired@.service
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para>
+        The only difference between 3 of them is what driver
+        is used for connecting (-D option). The first one uses
+        the default driver, the second one uses the nl80211
+        driver and the third one uses the wired driver.
+      </para>
+
+      <para>
+        You can connect to the wireless access point by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>systemctl start wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
+
+      <para>
+        To connect to the wireless access point at
+        boot, simply enable the appropriate
+        <command>wpa_supplicant</command> service
+        by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>systemctl enable wpa_supplicant@<replaceable>wlan0</replaceable></userinput></screen>
+
+      <para>
+        Depending on your setup, you can replace the
+        <filename>wpa_supplicant@.service</filename>
+        with any other listed above.
+      </para>
+
+      <para>
+        To assign a network address to your wireless interface,
+        consult the <ulink
+        url="&lfs-root;/chapter07/network.html">General Network Configuration</ulink>
+        page in LFS.
+      </para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          wpa_gui, wpa_supplicant, wpa_passphrase and wpa_cli
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="wpa_gui">
+        <term><command>wpa_gui</command></term>
+        <listitem>
+          <para>
+            is a graphical frontend program for interacting with
+            <application>wpa_supplicant</application>.
+          </para>
+          <indexterm zone="wpa_supplicant wpa_gui">
+            <primary sortas="b-wpa_gui">wpa_gui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wpa_supplicant-prog">
+        <term><command>wpa_supplicant</command></term>
+        <listitem>
+          <para>
+            is a daemon that can connect to a password protected wireless
+            access point.
+          </para>
+          <indexterm zone="wpa_supplicant wpa_supplicant-prog">
+            <primary sortas="b-wpa_supplicant">wpa_supplicant</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wpa_passphrase">
+        <term><command>wpa_passphrase</command></term>
+        <listitem>
+          <para>
+            takes an SSID and a password and generates a simple
+            configuration that <command>wpa_supplicant</command> can
+            understand.
+          </para>
+          <indexterm zone="wpa_supplicant wpa_passphrase">
+            <primary sortas="b-wpa_passphrase">wpa_passphrase</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wpa_cli">
+        <term><command>wpa_cli</command></term>
+        <listitem>
+          <para>
+            is a command line interface used to control a running
+            <command>wpa_supplicant</command> daemon.
+          </para>
+          <indexterm zone="wpa_supplicant wpa_cli">
+            <primary sortas="b-wpa_cli">wpa_cli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 032be1747ecd41e099afeb2c76fc5a6c20daab65)
+++ 	(revision )
@@ -1,505 +1,0 @@
-<?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 wpa_supplicant-download-http
-           "http://hostap.epitest.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
-  <!ENTITY wpa_supplicant-download-ftp  " ">
-  <!ENTITY wpa_supplicant-md5sum        "f2ed8fef72cf63d8d446a2d0a6da630a">
-  <!ENTITY wpa_supplicant-size          "2.3 MB">
-  <!ENTITY wpa_supplicant-buildsize     "30 MB">
-  <!ENTITY wpa_supplicant-time          "0.4 SBU">
-]>
-
-<sect1 id="wpa_supplicant" xreflabel="wpa_supplicant-&wpa_supplicant-version;">
-  <?dbhtml filename="wpa_supplicant.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>wpa_supplicant-&wpa_supplicant-version;</title>
-
-  <indexterm zone="wpa_supplicant">
-    <primary sortas="a-wpa_supplicant">wpa_supplicant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WPA Supplicant</title>
-
-    <para>
-      <application>WPA Supplicant</application> is a Wi-Fi Protected Access
-      (WPA) client and IEEE 802.1X supplicant. It implements WPA key negotiation
-      with a WPA Authenticator and Extensible Authentication Protocol (EAP)
-      authentication with an Authentication Server. In addition, it controls the
-      roaming and IEEE 802.11 authentication/association of the wireless LAN
-      driver. This is useful for connecting to a password protected wireless
-      access point.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wpa_supplicant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wpa_supplicant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wpa_supplicant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wpa_supplicant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wpa_supplicant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wpa_supplicant-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WPA Supplicant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnl"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="qt4"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/wpa_supplicant"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="wpa_supplicant-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration as well as
-      specific device drivers for your hardware and recompile the kernel if
-      necessary:
-    </para>
-
-<screen><literal>Networking support  --->                   [CONFIG_NET]
-  Wireless  --->                                            [CONFIG_WIRELESS]
-    cfg80211 - wireless configuration API: Y or M           [CONFIG_CFG80211]
-      cfg80211 wireless extensions compatibility: Y         [CONFIG_CFG80211_WEXT]
-    Generic IEEE 802.11 Networking Stack (mac80211): Y or M [CONFIG_MAC80211]
-Device Drivers  --->                         
-  Network device support  --->                              [CONFIG_NETDEVICES}
-    Wireless LAN  --->                                      [CONFIG_WLAN]</literal></screen>
-
-    <para>
-      Select the options that support your hardware:
-      <command>lspci</command> from <xref linkend="pciutils"/> can be used to
-      view your hardware configuration.
-    </para>
-
-    <indexterm zone="wpa_supplicant wpa_supplicant-kernel">
-      <primary sortas="d-wpa_supplicant">wpa_supplicant</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WPA Supplicant</title>
-
-    <para>
-      First you will need to create an initial configuration file for the
-      build process. You can read <filename>wpa_supplicant/README</filename>
-      and <filename>wpa_supplicant/defconfig</filename> for the explanation
-      of the following options as well as other options that can be used.
-      Create a build configuration file that should work for standard WiFi
-      setups by running the following command:
-    </para>
-
-<screen><userinput>cat &gt; wpa_supplicant/.config &lt;&lt; "EOF"
-<literal>CONFIG_BACKEND=file
-CONFIG_CTRL_IFACE=y
-CONFIG_DEBUG_FILE=y
-CONFIG_DEBUG_SYSLOG=y
-CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-CONFIG_DRIVER_NL80211=y
-CONFIG_DRIVER_WEXT=y
-CONFIG_DRIVER_WIRED=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_TLS=y
-CONFIG_EAP_TTLS=y
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_IPV6=y
-CONFIG_LIBNL32=y
-CONFIG_PEERKEY=y
-CONFIG_PKCS12=y
-CONFIG_READLINE=y
-CONFIG_SMARTCARD=y
-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
-      <xref linkend="dbus"/> and <xref linkend="libxml2"/>, then add the
-      following options to the <application>WPA Supplicant</application>
-      build configuration file by running the following command:
-    </para>
-
-<screen><userinput>cat &gt;&gt; wpa_supplicant/.config &lt;&lt; "EOF"
-<literal>CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-CONFIG_CTRL_IFACE_DBUS_INTRO=y</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>WPA Supplicant</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>cd wpa_supplicant &amp;&amp;
-make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="qt4"/> and wish to build
-      the <application>WPA Supplicant</application> GUI program, run
-      the following commands:
-    </para>
-
-<screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
-qmake wpa_gui.pro &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 wpa_{cli,passphrase,supplicant} /sbin/ &amp;&amp;
-install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5/ &amp;&amp;
-install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 /usr/share/man/man8/</userinput></screen>
-
-    <para>
-      If you have built <application>WPA Supplicant</application> with
-      <application>D-Bus</application> support, you will need to install
-      <application>D-Bus</application> configuration files. Install them
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
-                 /usr/share/dbus-1/system-services/ &amp;&amp;
-install -v -m644 dbus/dbus-wpa_supplicant.conf \
-                 /etc/dbus-1/system.d/wpa_supplicant.conf</userinput></screen>
-
-    <para>
-      If you have built the <application>WPA Supplicant</application> GUI
-      program, install it by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 wpa_gui-qt4/wpa_gui /usr/bin/ &amp;&amp;
-install -v -m644 doc/docbook/wpa_gui.8 /usr/share/man/man8/ &amp;&amp;
-install -v -m644 wpa_gui-qt4/wpa_gui.desktop /usr/share/applications/ &amp;&amp;
-install -v -m644 wpa_gui-qt4/icons/wpa_gui.svg /usr/share/pixmaps/</userinput></screen>
-
-    <note>
-      <para>
-        You will need to restart the system <application>D-Bus</application> daemon
-        before you can use the <application>WPA Supplicant</application>
-        <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">
-    <title>Configuring wpa_supplicant</title>
-
-    <sect3 id="wpa_supplicant-config">
-      <title>Config File</title>
-
-      <para>
-        <filename>/etc/sysconfig/wpa_supplicant-*.conf</filename>
-      </para>
-
-      <indexterm zone="wpa_supplicant wpa_supplicant-config">
-        <primary
-        sortas="e-etc-sysconfig-wpa_supplicant-star.conf">/etc/sysconfig/wpa_supplicant-*.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        To connect to an access point that uses a password, you need to put
-        the pre-shared key in <filename>
-        /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        SSID is the string that the access point/router transmits to
-        identify itself. Run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>wpa_passphrase <replaceable>SSID</replaceable> <replaceable>SECRET_PASSWORD</replaceable> &gt; /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</userinput></screen>
-
-      <para>
-        <filename>/etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf
-        </filename> can hold the details of several access points. When
-        <command>wpa_supplicant</command> is started, it will scan for the
-        SSIDs it can see and choose the appropriate password to connect.
-        </para>
-
-      <para>
-        If you want to connect to an access point that isn't password
-        protected, put an entry like this in <filename>
-        /etc/sysconfig/wpa_supplicant-<replaceable>wifi0</replaceable>.conf</filename>.
-        Replace "Some-SSID" with the SSID of the access point/router.
-      </para>
-
-<screen>network={
-  ssid="<replaceable>Some-SSID</replaceable>"
-  key_mgmt=NONE
-}</screen>
-
-      <para>
-        There are many options that you could use to tweak how you connect
-        to each access point. They are described in some detail in the
-        <filename>wpa_supplicant/wpa_supplicant.conf</filename> file in the
-        source tree.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Connecting to an Access Point</title>
-
-      <para id="wpa-service">
-        If you want to configure network interfaces at boot using
-        <command>wpa_supplicant</command>, you need to install the
-        <filename>/lib/services/wpa</filename> script
-        included in <xref linkend="bootscripts"/> package:
-      </para>
-
-<screen role="root"><userinput>make install-service-wpa</userinput></screen>
-
-      <indexterm zone="wpa_supplicant wpa-service">
-        <primary sortas="f-wpa">wpa</primary>
-      </indexterm>
-
-      <para>
-        If your router/access point uses DHCP to allocate IP addresses, you
-        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
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="dhclient"
-DHCP_START=""
-DHCP_STOP=""
-
-# Set PRINTIP="yes" to have the script print
-# the DHCP assigned IP address
-PRINTIP="no"
-
-# Set PRINTALL="yes" to print the DHCP assigned values for
-# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
-PRINTALL="no"</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you prefer <xref linkend="dhcpcd"/> instead of
-        <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:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="dhcpcd"
-DHCP_START="-b -q <replaceable>&lt;insert appropriate start options here&gt;</replaceable>"
-DHCP_STOP="-k <replaceable>&lt;insert additional stop options here&gt;</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para>
-        Alternatively, if you use static addresses on your local network,
-        then create the
-        <filename>/etc/sysconfig/ifconfig-<replaceable>wifi0</replaceable>
-        </filename> by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/ifconfig.<replaceable>wifi0</replaceable> &lt;&lt; "EOF"
-<literal>ONBOOT="yes"
-IFACE="<replaceable>wlan0</replaceable>"
-SERVICE="wpa"
-
-# Additional arguments to wpa_supplicant
-WPA_ARGS=""
-
-WPA_SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can connect to the wireless access point by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ifup <replaceable>wifi0</replaceable></userinput></screen>
-
-      <para>
-        Replace <replaceable>wlan0</replaceable> with the correct
-        wireless interface and <replaceable>wifi0</replaceable>
-        with desired name for the configuration file. Please note
-        that <filename>wpa_supplicant-*.conf</filename> and
-        <filename>ifconfig.*</filename> configuration files need
-        to have identical names, ie both contain
-        <replaceable>wifi0</replaceable> in their name.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wpa_gui, wpa_supplicant, wpa_passphrase and wpa_cli
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wpa_gui">
-        <term><command>wpa_gui</command></term>
-        <listitem>
-          <para>
-            is a graphical frontend program for interacting with
-            <application>wpa_supplicant</application>.
-          </para>
-          <indexterm zone="wpa_supplicant wpa_gui">
-            <primary sortas="b-wpa_gui">wpa_gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_supplicant-prog">
-        <term><command>wpa_supplicant</command></term>
-        <listitem>
-          <para>
-            is a daemon that can connect to a password protected wireless
-            access point.
-          </para>
-          <indexterm zone="wpa_supplicant wpa_supplicant-prog">
-            <primary sortas="b-wpa_supplicant">wpa_supplicant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_passphrase">
-        <term><command>wpa_passphrase</command></term>
-        <listitem>
-          <para>
-            takes an SSID and a password and generates a simple
-            configuration that <command>wpa_supplicant</command> can
-            understand.
-          </para>
-          <indexterm zone="wpa_supplicant wpa_passphrase">
-            <primary sortas="b-wpa_passphrase">wpa_passphrase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wpa_cli">
-        <term><command>wpa_cli</command></term>
-        <listitem>
-          <para>
-            is a command line interface used to control a running
-            <command>wpa_supplicant</command> daemon.
-          </para>
-          <indexterm zone="wpa_supplicant wpa_cli">
-            <primary sortas="b-wpa_cli">wpa_cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
