Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ general/genlib/gsl.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -97,5 +97,5 @@
 
     <para>If you have the optional <application>Sphinx</application> package
-    installed, buid the documentaiton with:</para>
+    installed, buid the documentation with:</para>
 
 <screen><userinput>make html</userinput></screen>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ general/prog/perl-modules.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -572,5 +572,5 @@
 (http://search.cpan.org/dist/DateTime)</literallayout>
         <itemizedlist>
-          <!-- Both DateTime ::Locale and DateTime::TimeZone now need
+          <!-- Both DateTime::Locale and DateTime::TimeZone now need
           namespace::autoclean, Specio and Params::ValidationCompiler.
           The latter needs Specio but only for its testsuite -->
@@ -947,18 +947,18 @@
               </listitem>
               <!-- Module::Implementation and Test::Fatal are pulled in by DateTime -->
-            </itemizedlist> <!-- end of deps for DateT ime-Format-Strptime -->
+            </itemizedlist> <!-- end of deps for DateTime-Format-Strptime -->
           </listitem>
           <!-- Test-Fatal and Test-Warnings pulled in by DateTime -->
+          <!-- Params-Validate -->
+          <listitem><literallayout><ulink url="http://search.cpan.org/dist/Params-Validate/">Params::Validate</ulink>
+(http://search.cpan.org/dist/Params-Validate/) - uses <xref linkend="perl-build-install"/></literallayout>
+          <!-- deps for Params::Validate:
+          Module::Build is a dep of Module::Implementation via Module::Runtime,
+          pulled in by Package::Stash in namespace::clean for
+          namespace::autoclean in DateTime, and for testsuites Test::Fatal is
+          pulled in for Dist::CheckConflicts for Package::Stash, and
+          Test::Requires by Package::Stash::XS for Package::Stash -->
+          </listitem>
         </itemizedlist>
-      </listitem>
-      <!-- Params-Validate -->
-      <listitem><literallayout><ulink url="http://search.cpan.org/dist/Params-Validate/">Params::Validate</ulink>
-(http://search.cpan.org/dist/Params-Validate/) - uses <xref linkend="perl-build-install"/></literallayout>
-         <!-- deps for Params::Validate:
-         Module::Build is a dep of Module::Implementation via Module::Runtime,
-         pulled in by Package::Stash in namespace::clean for
-         namespace::autoclean in DateTime, and for testsuites Test::Fatal is
-         pulled in for Dist::CheckConflicts for Package::Stash, and
-         Test::Requires by Package::Stash::XS for Package::Stash -->
       </listitem>
     </itemizedlist>
@@ -1660,6 +1660,6 @@
 
     <para>Module::Runtime provides functions to deal with runtime
-     handling of Perl modules. This module itself uses the standard
-    <xref linkend="perl-standard-install"/>.</para>
+     handling of Perl modules. This module itself uses the
+    <xref linkend="perl-build-install"/>.</para>
 
     <!-- Module-Runtime -->
Index: networking/netlibs/rpcsvc-proto.xml
===================================================================
--- networking/netlibs/rpcsvc-proto.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ networking/netlibs/rpcsvc-proto.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -33,5 +33,5 @@
       The <application>rpcsvc-proto</application> package contains the rcpsvc 
       protocol.x files and headers, formerly included with GlibC, that are not
-      included in replacment <xref linkend="libtirpc"/>, along with the rpcgen
+      included in replacement <xref linkend="libtirpc"/>, along with the rpcgen
       program.
     </para>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ networking/netprogs/nfs-utils.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -149,5 +149,5 @@
     as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>groupadd -g 99 nogroup &amp;&amp;
+<screen role="nodump"><userinput>groupadd -g 99 nogroup &amp;&amp;
 useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
     -s /bin/false -u 99 nobody</userinput></screen>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ networking/netprogs/samba.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -445,4 +445,23 @@
       </sect4>
 
+      <sect4>
+        <title>Guest account</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,
+        create the following group and account, if you haven't done so in LFS.
+        As the <systemitem class='username'>root</systemitem> user:</para>
+
+<screen role="role=nodump"><userinput>groupadd -g 99 nogroup &amp;&amp;
+useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
+        -s /bin/false -u 99 nobody</userinput></screen>
+
+      </sect4>
+
       <sect4 id="samba-init" revision="sysv">
         <title>Boot Script</title>
@@ -465,26 +484,5 @@
         </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>
@@ -494,12 +492,4 @@
       <sect4 id="samba-init-sysd" revision="systemd">
         <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.</para>
 
         <para>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ pst/scanning/sane.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -181,5 +181,5 @@
             --localstatedir=/var \
             --with-group=scanner \
-            --with-docdir=/usr/share/doc/sane-backend-&sane-version; &amp;&amp;
+            --with-docdir=/usr/share/doc/sane-backends-&sane-version; &amp;&amp;
 make</userinput></screen>
 
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision 99b60d667fff0d528d6f846ee5a76d98479e76b8)
+++ xsoft/office/abiword.xml	(revision 8c2155eeced46207125eeb1066012b8478eb2aa7)
@@ -225,5 +225,5 @@
 
     <para>
-      <command>sed ...</command>: These commands correc the source for
+      <command>sed ...</command>: These commands correct the source for
       changes in dependencies <xref linkend="enchant"/> and 
       <xref linkend="libical"/>.
