more samba cleanup from DJ

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2172 af4574ff-66df-0310-9fd7-8a98e5e911e0

server/other/samba3/samba3-config.xml

@@ -1,43 +1,35 @@
 <sect2>
 <title>Configuring <application>Samba</application></title>
-<para>Because of the infinate number of possible uses for 
-<application>Samba</application>, configuration is well beyond the scope
-of the BLFS book.  In fact, many complete books have been written on
-this topic alone.  The included documentation, a popular book published by
-O'Reilly, can be viewed by pointing your web browser to:</para>
-<screen><userinput><filename>file:///usr/share/samba/swat/using_samba/toc.html</filename></userinput></screen>
 
-<!--
+<para>Because of the various uses for <application>Samba</application>, 
-<para>There are also several other resources availible on the web.
+complete configuration is well beyond the scope of the BLFS book.  
-Below are a few links that show in detail some very good sample
+In fact, many complete books have been written on this topic alone.  
-configurations.</para>
+The included documentation, a popular book published by O'Reilly, 
+can be viewed by pointing your web browser to
+<ulink url="file:///usr/share/samba/swat/using_samba/toc.html" />.
+</para>
 
-  * This is for later....as soon as I find the example configs I had the
+<para>The built in <acronym>SWAT</acronym> (Samba Web Administration Tool) 
-  * other day....
+utility can be used for basic configuration, however, before 
+using <acronym>SWAT</acronym> you must add an entry to
+<filename>/etc/services</filename> and make changes to your
+<command>inetd</command>/<command>xinetd</command> 
+configuration.</para> 
 
-<para>Insert the links here along with descriptions of the 
+<para>Add the swat entry to <filename>/etc/services</filename> with the 
-sample configs. (use itemized list)</para>
--->
-
-<!-- 
-<para>Finally, the buit in SWAT (Samba Web Administation Tool) utility
--->
-<para>The built in SWAT (Samba Web Administration Tool) utility
-can be used for the very basic of configurations.  However, before 
-using SWAT, you must do a little configuration.</para>  
-
-<para>Add the swat entry to <filename>/etc/services</filename>with the 
 following command: </para>
 
 <screen><userinput><command>echo "swat            901/tcp" &gt;&gt; /etc/services</command></userinput></screen>
 
 <para>If <command>inetd</command> is used, the following command will add the 
 swat entry to <filename>/etc/inetd.conf</filename>: </para>
+
 <screen><userinput><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
     &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
-<para>If xinetd is used, the following command will add the swat entry
+<para>If <command>xinetd</command> is used, the following command will 
-to <filename>/etc/xinetd.conf</filename>: </para>
+add the swat entry to <filename>/etc/xinetd.conf</filename>: </para>
+
 <screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
 service swat
 {
@@ -52,8 +44,7 @@ service swat
 <command>EOF</command></userinput></screen>
 
 <para><acronym>SWAT</acronym> can be launched by pointing your web
-browser to:</para>
+browser to <ulink url="http://localhost:901"/>.</para>
-<screen><userinput><ulink url="http://localhost:901"/></userinput></screen>
 
 <para>For your convenience, boot scripts have been provided for
 <application>Samba</application>.  There are two included in the
@@ -66,9 +57,12 @@ daemon, used for providing Windows domain services to Linux clients.</para>
 
 <para>Install the <filename>samba</filename> script with the following 
 command:</para>
+
 <screen><userinput><command>make install-samba</command></userinput></screen>
 
 <para>If you also need the <filename>winbind</filename> script:</para>
+
 <screen><userinput><command>make install-winbind</command></userinput></screen>
+
 </sect2>
 

server/other/samba3/samba3-desc.xml

@@ -5,7 +5,7 @@
 <command>make_smbcodepage</command>,
 <command>make_unicodemap</command>,
 <command>mount.smbfs</command>,
-<command>net</command>
+<command>net</command>,
 <command>nmbd</command>,
 <command>nmblookup</command>,
 <command>rpcclient</command>,
@@ -53,8 +53,8 @@ lists.</para></sect3>
 <para><command>smbclient</command> is a <acronym>SMB</acronym>/<acronym>CIFS
 </acronym> access utility, similar to <acronym>FTP</acronym>.</para></sect3>
 <sect3><title>smbcontrol</title>
-<para><command>smbcontrol</command> is used to control running <command>smbd
+<para><command>smbcontrol</command> is used to control running <command>smbd</command>,
-</command>, <command>nmbd</command> and <command>winbindd</command>
+<command>nmbd</command> and <command>winbindd</command>
 daemons.</para></sect3>
 <sect3><title>smbd</title>
 <para><command>smbd</command> is the main
@@ -82,4 +82,3 @@ daemon.</para></sect3>
 <sect3><title>winbindd</title>
 <para><command>winbindd</command> resolves names from NT servers.</para></sect3>
 </sect2>
-

server/other/samba3/samba3-exp.xml

@@ -20,16 +20,22 @@ compliant with the Filesystem Hierarchy Standard
 
 <para><option>--with-smbmount</option>: Orders the creation of an extra 
 binary for use by the <command>mount</command> command so that mounting remote 
-<acronym>SMB</acronym> (windows) shares becomes no more complex than mounting 
+<acronym>SMB</acronym> (Windows) shares becomes no more complex than mounting 
 remote <acronym>NFS</acronym> shares.</para>
 
 <para><command>install -m755 nsswitch/libnss_win{s,bind}.so /lib</command>:
 The nss libs are not installed by default.  If you intend to use
 winbindd for domain auth, and/or <acronym>WINS</acronym> name resolution, 
-you need these libraries</para> 
+you need these libraries.</para> 
 
 <para><command>ln -sf libnss_winbind.so /lib/libnss_winbind.so.2</command> 
 and <command>ln -sf libnss_wins.so /lib/libnss_wins.so.2</command>:
 These symlinks are required by glibc to use the nss libs.</para>
 
+<para><command>cp ../examples/smb.conf.default /etc/samba</command>:
+This copies a default <filename>smb.conf </filename>into
+<filename>/etc/samba</filename>.  This sample configuration will not 
+work unless edited for your site, and renamed 
+<filename>smb.conf</filename>.</para>
+
 </sect2>

server/other/samba3/samba3-inst.xml

@@ -17,9 +17,11 @@ make &&
 make install &&
 install -m755 nsswitch/libnss_win{s,bind}.so /lib &&
 ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 &&
-ln -sf libnss_wins.so /lib/libnss_wins.so.2</command></userinput></screen>
+ln -sf libnss_wins.so /lib/libnss_wins.so.2 &amp;&amp;
+cp ../examples/smb.conf.default /etc/samba</command></userinput></screen>
 
-<para>Note: You may want to run configure with the
+<note><para>You may want to run <command>configure</command> with the
 <parameter>--help</parameter> parameter.  There may be other parameters 
- needed to take advantage of the optional dependencies.</para>
+needed to take advantage of the optional dependencies.</para></note>
+
 </sect2>

server/other/samba3/samba3-intro.xml

@@ -15,15 +15,16 @@ Windows networking to Linux clients.</para>
 </sect3>
 
 <sect3>
-<title><application>Samba</application> Dependencies</title>
+<title><application>Samba</application> dependencies</title>
 <sect4>
 <title>Optional</title>
-<para><xref linkend="Linux_PAM"/>,
+<para>
-<xref linkend="xinetd"/>,
+<xref linkend="Linux_PAM"/>,
 <xref linkend="readline"/>,
 <xref linkend="openldap"/>,
 <xref linkend="cups"/>,
-<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>.</para>
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>
+</para>
 </sect4>
 </sect3>