Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 17ad2b3de5c83ae4afe3dbd1a121cd0a7ad4f826)
+++ server/other/samba/samba-config.xml	(revision 2bbb5bda16dd67cd850f9ecdb86c9b1b1eab12c4)
@@ -1,14 +1,14 @@
 <sect2>
 <title>Configuring Samba</title>
-<para>We will configure 1 Samba server(SAMBABOX) to act as a primary
-domain controller, as well as configure 1 domain client running
+<para>We will configure one Samba server (SAMBABOX) to act as a primary
+domain controller, as well as configure one domain client running
 Windows 2000 Server(WIN2KBOX) and acting as a member server of the
 domain.  Detailed instructions will be given for adding WIN2KBOX to
 the domain due to the extra steps necessary.  Instructions for adding
 Windows 95/98/XP clients can be found in the newly installed
-documentation by pointing a web browser to : </para>
-
-<para><screen><userinput>
-file:///var/www/swat/using_samba/ch03_01.html#ch03-55770
+documentation by pointing a web browser to:</para>
+
+<para><screen><userinput>
+file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770
 .</userinput></screen></para>
 
Index: server/other/samba/samba-desc.xml
===================================================================
--- server/other/samba/samba-desc.xml	(revision 17ad2b3de5c83ae4afe3dbd1a121cd0a7ad4f826)
+++ server/other/samba/samba-desc.xml	(revision 2bbb5bda16dd67cd850f9ecdb86c9b1b1eab12c4)
@@ -5,4 +5,5 @@
 <userinput>make_smbcodepage</userinput>,
 <userinput>make_unicodemap</userinput>,
+<userinput>mount.smbfs</userinput>,
 <userinput>nmbd</userinput>,
 <userinput>nmblookup</userinput>,
@@ -31,4 +32,7 @@
 <para>make_unicodemap converts text unicode map files to binary, for
 use in mapping characters to 16 bit unicode.</para></sect3>
+<sect3><title>mount.smbfs</title>
+<para>mount.smbfs provides /bin/mount with a way to mount remote
+windows (or samba) fileshares</para></sect3>
 <sect3><title>nmbd</title>
 <para>nmbd is the Samba NetBIOS name server.</para></sect3>
Index: server/other/samba/samba-exp.xml
===================================================================
--- server/other/samba/samba-exp.xml	(revision 17ad2b3de5c83ae4afe3dbd1a121cd0a7ad4f826)
+++ server/other/samba/samba-exp.xml	(revision 2bbb5bda16dd67cd850f9ecdb86c9b1b1eab12c4)
@@ -2,13 +2,19 @@
 <title>Installation command explanations</title>
 
-<para><screen><userinput>mkdir /var/www
-mkdir /var/www/swat :</userinput></screen>
-Directories needed for Samba Web Administration tool.</para>
+<para><screen><userinput>mkdir -p /etc/samba/private
+mkdir -p /var/cache/samba :</userinput></screen>
+Directories needed for proper operation of the smbd and nmbd daemons.</para>
 
-<para><userinput>--sysconfigdir=/etc/samba :</userinput> Samba configuration file directory.</para>
+<para><userinput>--prefix=/usr :</userinput> Sets the prefix for almost all the file paths to /usr.</para>
 
-<para><userinput>--with-privatedir=/etc/samba/private :</userinput> Location of Samba <filename>smbpasswd</filename> and <filename>secrets.tdb</filename> file.</para>
+<para><userinput>--sysconfdir=/etc :</userinput> Sets the configuration file directory to avoid the default of /usr/etc.</para>
 
-<para><userinput>--with-swatdir=/var/www/swat :</userinput> Location of Samba Web Administration Tool files.</para>
+<para><userinput>--localstatedir=/var :</userinput> Sets the variable data directory to avoid the default of /usr/var.</para>
+
+<para><userinput>--with-fhs :</userinput> Assigns all other file paths in a manner compliant with the Filesystem Hierarchy Standard.</para>
+
+<para><userinput>--with-smbmount :</userinput> Orders the creation of an extra binary for use by the mount command so that mounting remote SMB (windows) shares becomes no more complex than mounting remote NFS shares.</para>
+
+<para><userinput>rm -rf /usr/private : </userinput> Removes a directory erroneously created by source/scripts/installbin.sh during the make install.</para>
 
 </sect2>
Index: server/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 17ad2b3de5c83ae4afe3dbd1a121cd0a7ad4f826)
+++ server/other/samba/samba-inst.xml	(revision 2bbb5bda16dd67cd850f9ecdb86c9b1b1eab12c4)
@@ -8,20 +8,19 @@
 
 <para><screen><userinput>
-mkdir /var/www &&
-mkdir /var/www/swat &&
+mkdir -p /etc/samba/private &&
+mkdir -p /var/cache/samba &&
 ./configure \
    --prefix=/usr \
-   --with-logfilebase=/var/log \
-   --libexecdir=/usr \
-   --sysconfdir=/etc/samba \
-   --with-privatedir=/etc/samba/private \
-   --with-lockdir=/var/lock \
-   --with-piddir=/var/run \
-   --with-swatdir=/var/www/swat \
-   --with-configdir=/etc/samba &amp;&amp;
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --with-fhs \
+   --with-smbmount &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-mkdir /etc/samba &amp;&amp;
-mkdir /etc/samba/private &amp;&amp;
+mv /usr/bin/smbmount /usr/bin/mount.smbfs &amp;&amp;
+rm -rf /usr/private &amp;&amp;
+echo "swat 901/tcp" >> /etc/services &amp;&amp;
+echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" >> \
+   /etc/inetd.conf
 </userinput></screen></para>
 </sect2>
Index: server/other/samba/samba.ent
===================================================================
--- server/other/samba/samba.ent	(revision 17ad2b3de5c83ae4afe3dbd1a121cd0a7ad4f826)
+++ server/other/samba/samba.ent	(revision 2bbb5bda16dd67cd850f9ecdb86c9b1b1eab12c4)
@@ -7,7 +7,7 @@
 <!ENTITY samba-config SYSTEM "samba-config.xml">
 <!ENTITY samba-buildsize "37 MB">
-<!ENTITY samba-version "2.2.6">
+<!ENTITY samba-version "2.2.7">
 <!ENTITY samba-download-http
-"http://us1.samba.org/samba/ftp/samba-latest.tar.gz">
+"http://us1.samba.org/samba/ftp/samba-&samba-version;.tar.gz">
 <!ENTITY samba-download-ftp "">
 <!ENTITY samba-size "5.3 MB">
