Index: index.xml
===================================================================
--- index.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ index.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -3,7 +3,7 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040515">
-<!ENTITY releasedate "May 15th, 2004">
-<!ENTITY pubdate "2004-05-15">
+<!ENTITY version "CVS-20040516">
+<!ENTITY releasedate "May 16th, 2004">
+<!ENTITY pubdate "2004-05-16">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ introduction/welcome/changelog.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>May 16th, 2004 [igor]: Applied Samba cleanup patch,
+submitted by DJ Lucas.</para></listitem>
 
 <listitem><para>May 15th, 2004 [tushar]: Added note in the vim page
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ introduction/welcome/credits.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -173,5 +173,6 @@
 STLport, tcl, tk and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
 
-<listitem><para>cracklib, libpcap, ncpfs, netfs, ppp(update) and RP-PPPoE: <emphasis>DJ Lucas</emphasis></para></listitem>
+<listitem><para>cracklib, libpcap, ncpfs, netfs, ppp(update), RP-PPPoE
+and Samba-3: <emphasis>DJ Lucas</emphasis></para></listitem>
 
 <listitem><para>ntp: <emphasis>Eric Konopka</emphasis></para></listitem>
Index: server/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ server/other/samba/samba-inst.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -12,13 +12,13 @@
 
 <screen><userinput><command>cd source &amp;&amp;
-mkdir -p /etc/samba/private &amp;&amp;
-mkdir -p /var/cache/samba &amp;&amp;
+install -d /etc/samba/private &amp;&amp;
+install -d /var/cache/samba &amp;&amp;
 ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --with-piddir=/var/run \
-   --with-fhs \
-   --with-smbmount &amp;&amp;
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-piddir=/var/run \
+    --with-fhs \
+    --with-smbmount &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -27,5 +27,4 @@
 echo "swat 901/tcp" &gt;&gt; /etc/services &amp;&amp;
 echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt; \
-   /etc/inetd.conf</command></userinput></screen>
+    /etc/inetd.conf</command></userinput></screen>
 </sect2>
-
Index: server/other/samba3/samba3-config.xml
===================================================================
--- server/other/samba3/samba3-config.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ server/other/samba3/samba3-config.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -6,5 +6,5 @@
 this topic alone.  The included documentation, a popular book published by
 O'Reilly, can be viewed by pointing your web browser to:</para>
-<para><screen><userinput>file:///usr/share/samba/swat/using_samba/toc.html</userinput></screen></para>
+<screen><userinput><filename>file:///usr/share/samba/swat/using_samba/toc.html</filename></userinput></screen>
 
 <!--
@@ -54,5 +54,5 @@
 <para><acronym>SWAT</acronym> can be launched by pointing your web
 browser to:</para>
-<screen><userinput><command>http://localhost:901</command></userinput></screen>
+<screen><userinput><ulink url="http://localhost:901"/></userinput></screen>
 
 <para>For your convenience, boot scripts have been provided for
@@ -67,8 +67,8 @@
 <para>Install the <filename>samba</filename> script with the following 
 command:</para>
-<para><screen><userinput>make install-samba</userinput></screen></para>
+<screen><userinput><command>make install-samba</command></userinput></screen>
 
 <para>If you also need the <filename>winbind</filename> script:</para>
-<para><screen><userinput>make install-winbind</userinput></screen></para>
+<screen><userinput><command>make install-winbind</command></userinput></screen>
 </sect2>
 
Index: server/other/samba3/samba3-desc.xml
===================================================================
--- server/other/samba3/samba3-desc.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ server/other/samba3/samba3-desc.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -6,4 +6,5 @@
 <command>make_unicodemap</command>,
 <command>mount.smbfs</command>,
+<command>net</command>
 <command>nmbd</command>,
 <command>nmblookup</command>,
@@ -33,4 +34,7 @@
 <para><command>mount.smbfs</command> provides <command>/bin/mount</command> 
 with a way to mount remote windows (or samba) fileshares.</para></sect3>
+<sect3><title>net</title>
+<para><command>net</command> is a tool for administration of Samba and remote
+CIFS servers, similar to the net utility for DOS/Windows.</para></sect3>
 <sect3><title>nmbd</title>
 <para><command>nmbd</command> is the Samba Net<acronym>BIOS</acronym> name 
Index: server/other/samba3/samba3-exp.xml
===================================================================
--- server/other/samba3/samba3-exp.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ server/other/samba3/samba3-exp.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -2,5 +2,5 @@
 <title>Installation command explanations</title>
 
-<para><command>'mkdir -p /var/cache/samba'</command>: This directory is 
+<para><command>install -d /var/cache/samba</command>: This directory is 
 needed for proper operation of the <command>smbd</command> and 
 <command>nmbd</command> daemons.</para>
@@ -24,11 +24,11 @@
 remote <acronym>NFS</acronym> shares.</para>
 
-<para><command>'install -m755 nsswitch/libnss_win{s,bind}.so /lib'</command>:
+<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> 
 
-<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>:
+<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>
 
Index: server/other/samba3/samba3-inst.xml
===================================================================
--- server/other/samba3/samba3-inst.xml	(revision 9c12e42d32134299f07ff6ae533fdcaa962433bd)
+++ server/other/samba3/samba3-inst.xml	(revision 8cfd1f9713194dff1553e14478c7ad56c4680c0d)
@@ -5,14 +5,13 @@
 commands:</para>
 
-
 <screen><userinput><command>cd source &amp;&amp;
-mkdir -p /var/cache/samba &amp;&amp;
+install -d /var/cache/samba &amp;&amp;
 ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --with-piddir=/var/run \
-   --with-fhs \
-   --with-smbmount &amp;&amp;
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --with-piddir=/var/run \
+    --with-fhs \
+    --with-smbmount &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -25,3 +24,2 @@
  needed to take advantage of the optional dependencies.</para>
 </sect2>
-
