Index: index.xml
===================================================================
--- index.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ index.xml	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 
-<!ENTITY version "cvs-20040528">
-<!ENTITY releasedate "May 28th, 2004">
-<!ENTITY pubdate "2004-05-28">
+<!ENTITY version "cvs-20040529">
+<!ENTITY releasedate "May 29th, 2004">
+<!ENTITY pubdate "2004-05-29">
 <!ENTITY blfs-version "cvs">
 <!ENTITY last-commit "Sun May 23 11:58:20 CDT 2004">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ introduction/welcome/changelog.xml	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -11,4 +11,8 @@
 
 <itemizedlist>
+
+<listitem><para>May 29th, 2004 [igor]: Moved the samba maintainer
+patch to samba3 page, reported by Manuel Canales
+Esparcia.</para></listitem>
 
 <listitem><para>May 28th, 2004 [larry]: typos and tetex patch for
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ server/other/other.xml	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -17,7 +17,4 @@
 &rsync;
 &openldap;
-<!-- 
-&samba;
--->
 &samba3;
 &xinetd;
Index: rver/other/samba.xml
===================================================================
--- server/other/samba.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<sect1 id="samba" xreflabel="Samba-&samba-version;">
-<?dbhtml filename="samba.html"?>
-<title>Samba-&samba-version;</title>
-
-&samba-intro;
-&samba-inst;
-&samba-exp;
-&samba-config;
-&samba-config-exp;
-&samba-desc;
-
-</sect1>
-
Index: rver/other/samba/samba-config-exp.xml
===================================================================
--- server/other/samba/samba-config-exp.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<sect2>
-<title>Configuration command explanations</title>
-<para><command>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</command>
-: Create a default <application>Samba</application> configuration file.  This 
-configuration will allow <application>Samba</application> to act as a Primary 
-Domain Controller for a Microsoft Windows based network.  If this is not 
-desired, a simpler default <filename>smb.conf</filename> file is bundled with 
-the Samba distribution.  See the 
-<filename>samba&samba-version;/examples/smb.conf.default</filename>
-file.  Primary Domain Controller configuration is slightly more
-complicated than ordinary member server configuration, so instructions
-for <acronym>PDC</acronym> configuration will be given here.</para>
-
-
-<para><command>cat &gt; /etc/rc.d/init.d/samba &lt;&lt;
-"EOF"</command>: Create the <application>Samba</application> boot script, 
-used to start and stop <application>Samba</application> automatically on 
-machine startup and shutdown.</para>
-
-<para><screen><command>/usr/sbin/useradd -g 100 -d /dev/null -c \
-    "Win2k Server" -s /bin/false win2kbox$</command></screen>
-This command creates a machine trust account, necessary only for
-Windows 2000/NT servers to authenticate to our new <acronym>PDC</acronym>.  
-Machine trust accounts are not necessary for Win95/98 clients.</para>
-
-<para><command>echo "swat 901/tcp" &gt;&gt; /etc/services</command>: Register 
-the swat service to run on port 901.</para> 
-
-<para><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" 
-&gt;&gt; /etc/inetd.conf</command>: Instruct <command>inetd</command> where to find and how to
-run swat.</para> 
-
-<para><command>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba
-</command> etc.: Create the <application>Samba</application> boot scripts, 
-used to start and stop <application>Samba</application> automatically on 
-machine startup and shutdown.</para>
-</sect2>
-
Index: rver/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<sect2>
-<title>Configuring <application>Samba</application></title>
-<para>We will configure one <application>Samba</application> 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>
-
-<screen><userinput>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</userinput></screen>
-
-<sect3><title>Config files</title>
-<para><filename>/etc/samba/smb.conf</filename>,
-<filename>/etc/rc.d/init.d/samba </filename></para>
-
-<para>First we set up some directories needed by <application>Samba
-</application>:</para>
-<screen><userinput><command>mkdir /var/lib/samba &amp;&amp;
-mkdir /var/lib/samba/netlogon &amp;&amp;
-mkdir /var/lib/samba/ntprofile &amp;&amp;
-mkdir /var/lib/samba/profiles &amp;&amp;
-chmod -R 1777 /var/lib/samba</command></userinput></screen>
-
-<para>And the <application>Samba</application> configuration file: </para>
-<screen><userinput><command>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</command>
-[global]
-    netbios name = SAMBABOX
-    workgroup = DOMAIN01
-    os level = 64
-    preferred master = yes
-    domain master = yes
-    local master = yes
-    security = user
-    encrypt passwords = yes
-    domain logons = yes
-    log file = /var/log/log.%m
-    log level = 1
-    logon path = \\%N\home\%u\windows
-    logon drive = H:
-    logon home = \\homeserver\%u\windows
-    logon script = logon.cmd
-[netlogon]
-      path = /var/lib/samba/netlogon
-      read only = yes
-      write list = ntadmin
-[profiles]
-      path = /var/lib/samba/ntprofile
-      read only = no
-      create mask = 0600
-      directory mask = 0700
-; World writable share for testing
-[tmp]
-comment = Temporary file space
-        path = /tmp
-        read only = no
-        public = yes
-[home]
-comment = Users' home directories
-        path = /home
-        read only = no
-        public = no
-<command>EOF</command></userinput></screen>
-
-<para>Now add the machine trust account for WIN2KBOX:</para>
-<screen><userinput><command>/usr/sbin/useradd -g 100 -d /dev/null -c \
-    "machine nickname" -s /bin/false win2kbox$ &amp;&amp;
-passwd -l win2kbox$ &amp;&amp;
-smbpasswd -a -m win2kbox</command></userinput></screen>
-
-<para>Install <filename>/etc/rc.d/init.d/samba</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
-<screen><userinput><command>make install-samba</command></userinput></screen>
-
-<para>Now, we'll use our new boot script to start <application>Samba
-</application>: </para>
-<screen><userinput><command>/etc/rc.d/init.d/samba start</command></userinput></screen>
-<para>We have to add the SAMBABOX root account to the <application>Samba
-</application> user list first in order to join WIN2KBOX to the DOMAIN01 
-domain: </para>
-
-<screen><userinput><command>smbpasswd -a root</command></userinput></screen>
-
-<para>After starting <application>Samba</application> and adding root to
-the <application>Samba</application> user list, the first machine we'll join 
-to DOMAIN01 will be WIN2KBOX, the Windows 2000 Server box we created the 
-machine trust account for.  On WIN2KBOX:</para>
-<screen><userinput>1.  Right click on My Computer.
-2.  Click on Properties.
-3.  Click on the Network Identification notebook tab.
-4.  Click on the Properties button.
-5.  In the Computer Name: edit field enter WIN2KBOX.
-6.  Click on the Domain: radio button and enter DOMAIN01 in the edit
-    field and click OK.
-7.  When presented with the Domain Username And Password dialog box,
-    enter root and root's password on SAMBABOX and click OK.
-8.  After the machine trust is negotiated, click the OK button in the
-    dialog box welcoming you to the DOMAIN01 domain.
-9.  Click OK in the reboot reminder dialog box.
-10. Click OK to close the System Properties window.
-11. Click Yes to reboot WIN2KBOX.</userinput></screen></sect3>
-
-<sect3><title>Add a new user to the DOMAIN01 domain.</title>
-<para>Before logging on to WIN2KBOX, we will create a new user with
-    the following commands:</para>
-<screen><userinput><command>useradd -m win2kuser01 &amp;&amp;
-passwd win2kuser01 &amp;&amp;
-smbpasswd -a win2kuser01</command></userinput></screen></sect3>
-
-<sect3><title>Logging on to DOMAIN01.</title>
-<para>Now we will log on the domain as our newly created user as
-    follows:</para> 
-<screen><userinput>1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
-2. Enter the win2kuser01 name and password.
-3. Select DOMAIN01 from the Log on to: combination box and click OK.</userinput></screen>
-
-<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
-to <filename>/etc/xinetd.conf</filename>: </para>
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
-service swat
-{
-    port            = 901
-    socket_type     = stream
-    wait            = no
-    only_from       = 127.0.0.1
-    user            = root
-    server          = /usr/sbin/swat
-    log_on_failure  += USERID
-}
-<command>EOF</command></userinput></screen>
-
-<para>The Samba Web Administration Tool, <acronym>SWAT</acronym>, can be 
-launched with the following command on SAMBABOX: </para>
-<screen><userinput><command>lynx http://localhost:901</command></userinput></screen>
-<note><para>Be sure <command>inetd</command> is running, and issue a
-<command>killall -HUP inetd</command> before starting
-<acronym>SWAT</acronym>.</para></note>
-<para>The <application>Lynx</application> browser is used in this 
-demonstration, but is not necessary.</para></sect3>
-
-</sect2>
-
Index: rver/other/samba/samba-desc.xml
===================================================================
--- server/other/samba/samba-desc.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>Samba</application> package contains
-<command>make_smbcodepage</command>,
-<command>make_unicodemap</command>,
-<command>mount.smbfs</command>,
-<command>nmbd</command>,
-<command>nmblookup</command>,
-<command>rpcclient</command>,
-<command>smbcacls</command>,
-<command>smbclient</command>,
-<command>smbcontrol</command>,
-<command>smbd</command>,
-<command>smbpasswd</command>,
-<command>smbspool</command>,
-<command>smbstatus</command>,
-<command>swat</command>,
-<command>testparm</command>,
-<command>testprns</command>,
-<command>wbinfo</command> and
-<command>winbindd.</command></para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>make_smbcodepage</title>
-<para><command>make_smbcodepage</command> converts text descriptions of code 
-pages to binary code page files and vice versa.</para></sect3>
-<sect3><title>make_unicodemap</title>
-<para><command>make_unicodemap</command> converts text Unicode map files to 
-binary, for use in mapping characters to 16 bit Unicode.</para></sect3>
-<sect3><title>mount.smbfs</title>
-<para><command>mount.smbfs</command> provides <command>/bin/mount</command> 
-with a way to mount remote windows (or samba) fileshares.</para></sect3>
-<sect3><title>nmbd</title>
-<para><command>nmbd</command> is the Samba Net<acronym>BIOS</acronym> name 
-server.</para></sect3>
-<sect3><title>nmblookup</title>
-<para><command>nmblookup</command> is used to query
-Net<acronym>BIOS</acronym> names and map them to <acronym>IP</acronym>
-addresses.</para></sect3>
-<sect3><title>rpcclient</title>
-<para><command>rpcclient</command> is used to execute
-MS-<acronym>RPC</acronym> client side functions.</para></sect3>
-<sect3><title>smbcacls</title>
-<para><command>smbcacls</command> is used to manipulate NT access control
-lists.</para></sect3>
-<sect3><title>smbclient</title>
-<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
-</command>, <command>nmbd</command> and <command>winbindd</command>
-daemons.</para></sect3>
-<sect3><title>smbd</title>
-<para><command>smbd</command> is the main
-<application>Samba</application> daemon.</para></sect3>
-<sect3><title>smbpasswd</title>
-<para><command>smbpasswd</command> changes a user's <application>Samba
-</application> password.</para></sect3>
-<sect3><title>smbspool</title>
-<para><command>smbspool</command> sends a print job to an <acronym>SMB
-</acronym> printer.</para></sect3>
-<sect3><title>smbstatus</title>
-<para><command>smbstatus</command> reports current
-<application>Samba</application> connections.</para></sect3>
-<sect3><title>swat</title>
-<para><command>swat</command> is the Samba Web Administration Tool.</para>
-</sect3>
-<sect3><title>testparm</title>
-<para><command>testparm</command> checks an <filename>smb.conf</filename> file 
-for proper syntax.</para></sect3>
-<sect3><title>testprns</title>
-<para><command>testprns</command> tests printer names.</para></sect3>
-<sect3><title>wbinfo</title>
-<para><command>wbinfo</command> queries a running <command>winbindd</command> 
-daemon.</para></sect3>
-<sect3><title>winbindd</title>
-<para><command>winbindd</command> resolves names from NT servers.</para></sect3>
-</sect2>
-
Index: rver/other/samba/samba-exp.xml
===================================================================
--- server/other/samba/samba-exp.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<sect2>
-<title>Installation command explanations</title>
-
-<para><screen><command>mkdir -p /etc/samba/private
-mkdir -p /var/cache/samba</command></screen>
-Directories needed for proper operation of the <command>smbd</command>
-and <command>nmbd</command> daemons.</para>
-
-<para><parameter>--prefix=/usr</parameter>: Sets the prefix for almost
-all the file paths to <filename class="directory">/usr</filename>.</para>
-
-<para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
-file directory to avoid the default of <filename class="directory">/usr/etc</filename>.</para>
-
-<para><parameter>--localstatedir=/var</parameter>: Sets the variable
-data directory to avoid the default of <filename class="directory">/usr/var</filename>.</para>
-
-<para><option>--with-fhs</option>: Assigns all other file paths in a manner 
-compliant with the Filesystem Hierarchy Standard (<acronym>FHS</acronym>).</para>
-
-<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 
-remote <acronym>NFS</acronym> shares.</para>
-
-<para><command>rm -rf /usr/private</command>: Removes a directory
-erroneously created by <filename>source/scripts/installbin.sh</filename> during the make install.</para>
-
-</sect2>
Index: rver/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<sect2>
-<title>Installation of <application>Samba</application></title>
-
-<para>Install <application>Samba</application> by running the following 
-commands:</para>
-
-<!--
-<note><para><application>Samba</application> is installed from the 
-<filename class="directory">samba-&samba-version;/source</filename> directory.
-</para></note>
--->
-
-<screen><userinput><command>patch -Np1 -i samba-3.0.4-maintainer.patch &amp;&amp;
-cd source &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;
-make &amp;&amp;
-make install &amp;&amp;
-<!-- mv /usr/bin/smbmount /usr/bin/mount.smbfs &amp;&amp; -->
-rm -rf /usr/private &amp;&amp;
-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>
-</sect2>
Index: rver/other/samba/samba-intro.xml
===================================================================
--- server/other/samba/samba-intro.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<sect2>
-<title>Introduction to <application>Samba</application></title>
-
-<para>The <application>Samba</application> package provides file and print 
-services to <acronym>SMB</acronym>/<acronym>CIFS</acronym> clients.</para>
-
-<sect3><title>Package information</title>
-<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 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>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Maintainer Recommended patch:
-<ulink url="&patch-root;/samba-3.0.4-maintainer.patch"/></para></listitem>
-</sect3>
-
-</sect2>
Index: rver/other/samba/samba.ent
===================================================================
--- server/other/samba/samba.ent	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<!ENTITY samba SYSTEM "../samba.xml">
-<!ENTITY samba-intro SYSTEM "samba-intro.xml">
-<!ENTITY samba-inst SYSTEM "samba-inst.xml">
-<!ENTITY samba-exp SYSTEM "samba-exp.xml">
-<!ENTITY samba-config SYSTEM "samba-config.xml">
-<!ENTITY samba-config-exp SYSTEM "samba-config-exp.xml">
-<!ENTITY samba-desc SYSTEM "samba-desc.xml">
-<!ENTITY samba-version "2.2.8a">
-<!ENTITY samba-download-http "http://us1.samba.org/samba/ftp/old-versions/samba-&samba-version;.tar.gz">
-<!ENTITY samba-download-ftp " ">
-<!ENTITY samba-size "4.4 MB">
-<!ENTITY samba-buildsize "43 MB">
-<!ENTITY samba-time "5.40 SBU">
Index: server/other/samba3/samba3-inst.xml
===================================================================
--- server/other/samba3/samba3-inst.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ server/other/samba3/samba3-inst.xml	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -5,5 +5,6 @@
 commands:</para>
 
-<screen><userinput><command>cd source &amp;&amp;
+<screen><userinput><command>patch -Np1 -i samba-3.0.4-maintainer.patch &amp;&amp;
+cd source &amp;&amp;
 install -d /var/cache/samba &amp;&amp;
 ./configure \
Index: server/other/samba3/samba3-intro.xml
===================================================================
--- server/other/samba3/samba3-intro.xml	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ server/other/samba3/samba3-intro.xml	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -13,4 +13,11 @@
 <listitem><para>Estimated Disk space required: &samba3-buildsize;</para></listitem>
 <listitem><para>Estimated build time: &samba3-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Maintainer Recommended patch:
+<ulink url="&patch-root;/samba-3.0.4-maintainer.patch"/></para></listitem>
+</itemizedlist>
 </sect3>
 
Index: server/server.ent
===================================================================
--- server/server.ent	(revision 9cc09ebf752bc9dc923ed0a77efe27a842d4da06)
+++ server/server.ent	(revision bb0d842be5dce03fe0e5f28758d9b54604c194b6)
@@ -23,7 +23,4 @@
 <!ENTITY % xinetd     SYSTEM "other/xinetd/xinetd.ent">
 <!ENTITY % leafnode   SYSTEM "other/leafnode/leafnode.ent">
-<!--
-<!ENTITY % samba      SYSTEM "other/samba/samba.ent">
--->
 <!ENTITY % samba3     SYSTEM "other/samba3/samba3.ent">
 <!ENTITY % openldap   SYSTEM "other/openldap/openldap.ent">
@@ -36,7 +33,4 @@
 %openssh;
 %rsync;
-<!--
-%samba;
--->
 %samba3;
 %xinetd;
