Another copy editor update.

(This used to be commit 529c3f0c8a751772f9e7e470a26500d53a59d5cc)

10 files changed, 55 insertions, 50 deletions

diff --git a/docs/Samba-Guide/SBE-2000UserNetwork.xml b/docs/Samba-Guide/SBE-2000UserNetwork.xml
index 6afd7016ea..f3fc8b0805 100644
--- a/docs/Samba-Guide/SBE-2000UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-2000UserNetwork.xml
@@ -381,7 +381,7 @@
 	    the logon protocols and principles of operation are
 	    concerned. The following information pertains exclusively to the
 	    interaction between a Windows XP Professional workstation and a
-	    Samba-3.0.15 server. In the discussion that follows, use is made of
+	    Samba-3.0.20 server. In the discussion that follows, use is made of
 	    DHCP and WINS.</para>
 
 	  <para>As soon as the Windows workstation starts up, it obtains an
diff --git a/docs/Samba-Guide/SBE-AddingUNIXClients.xml b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
index 98f0d85af5..8c8210f1bb 100644
--- a/docs/Samba-Guide/SBE-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
@@ -1615,7 +1615,7 @@ logonCount: 13
 sAMAccountName: fran$
 sAMAccountType: 805306369
 operatingSystem: Samba
-operatingSystemVersion: 3.0.15-SUSE
+operatingSystemVersion: 3.0.20-SUSE
 dNSHostName: fran
 userPrincipalName: HOST/fran@LONDON.ABMAS.BIZ
 servicePrincipalName: CIFS/fran.london.abmas.biz
@@ -1763,7 +1763,7 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt-
 <smbconfoption name="unix charset">LOCALE</smbconfoption>
 <smbconfoption name="workgroup">LONDON</smbconfoption>
 <smbconfoption name="realm">LONDON.ABMAS.BIZ</smbconfoption>
-<smbconfoption name="server string">Samba 3.0.15</smbconfoption>
+<smbconfoption name="server string">Samba 3.0.20</smbconfoption>
 <smbconfoption name="security">ADS</smbconfoption>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
diff --git a/docs/Samba-Guide/SBE-Appendix1.xml b/docs/Samba-Guide/SBE-Appendix1.xml
index ac924c0a4f..0940f4da41 100644
--- a/docs/Samba-Guide/SBE-Appendix1.xml
+++ b/docs/Samba-Guide/SBE-Appendix1.xml
@@ -254,7 +254,7 @@ Paths:
 	If you wish to locate the Samba version, just run:
 <screen>
 &rootprompt; /path-to-binary-file/smbd -V
-Version 3.0.15-SUSE
+Version 3.0.20-SUSE
 </screen>
 	</para>
 
@@ -266,15 +266,15 @@ Version 3.0.15-SUSE
 	</indexterm>
 <screen>
 &rootprompt; rpm -qa | grep samba
-samba3-pdb-3.0.15-1
-samba3-vscan-0.3.5-0
-samba3-winbind-3.0.15-1
-samba3-3.0.15-1
-samba3-python-3.0.15-1
-samba3-utils-3.0.15-1
-samba3-doc-3.0.15-1
-samba3-client-3.0.15-1
-samba3-cifsmount-3.0.15-1
+samba3-pdb-3.0.20-1
+samba3-vscan-0.3.6-0
+samba3-winbind-3.0.20-1
+samba3-3.0.20-1
+samba3-python-3.0.20-1
+samba3-utils-3.0.20-1
+samba3-doc-3.0.20-1
+samba3-client-3.0.20-1
+samba3-cifsmount-3.0.20-1
 	</screen><indexterm>
 	  <primary>package names</primary>
 	</indexterm>
diff --git a/docs/Samba-Guide/SBE-Appendix2.xml b/docs/Samba-Guide/SBE-Appendix2.xml
index f86dc54c69..d57c519faf 100644
--- a/docs/Samba-Guide/SBE-Appendix2.xml
+++ b/docs/Samba-Guide/SBE-Appendix2.xml
@@ -202,7 +202,7 @@
 		<listitem><para>Windows 98 &smbmdash; name: MILGATE98.</para></listitem>
 		<listitem><para>Windows Me &smbmdash; name: WINEPRESSME.</para></listitem>
 		<listitem><para>Windows XP Professional &smbmdash; name: LightrayXP.</para></listitem>
-		<listitem><para>Samba-3.0.15 running on a SUSE Enterprise Linux 9.</para></listitem>
+		<listitem><para>Samba-3.0.20 running on a SUSE Enterprise Linux 9.</para></listitem>
 	</itemizedlist>
 
 	<para>
diff --git a/docs/Samba-Guide/SBE-MakingHappyUsers.xml b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
index ee6ac4ce4e..5fc3893aa7 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
@@ -1322,7 +1322,7 @@ slapd[12164]: conn=1 fd=10 closed
 	</para>
 
 <note><para>
-The following information applies to Samba-3.0.15 when used with the Idealx smbldap-tools scripts
+The following information applies to Samba-3.0.20 when used with the Idealx smbldap-tools scripts
 version 0.8.8. If using a different version of Samba, or of the smbldap-tools tarball, please 
 verify that the versions you are about to use are matching. The smbldap-tools package uses counter
 entries in the LDAP directory to avoid duplication of the UIDs and GIDs that are issued for POSIX
@@ -1753,8 +1753,8 @@ session  optional    pam_mail.so
 	<para><indexterm>
 	    <primary>Samba RPM Packages</primary>
 	  </indexterm>
-	Verify that the Samba-3.0.15 (or later) packages are installed on each SUSE Linux server 
-	before following the steps below. If Samba-3.0.15 (or later) is not installed, you have the
+	Verify that the Samba-3.0.20 (or later) packages are installed on each SUSE Linux server 
+	before following the steps below. If Samba-3.0.20 (or later) is not installed, you have the
 	choice to either build your own or to obtain the packages from a dependable source.
 	Packages for SUSE Linux 8.x, 9.x and SUSE Linux Enterprise Server 9, as well as for 
 	Red Hat Fedora Core and Red Hat Enterprise Linux Server 3 and 4 are included on the CD-ROM that
@@ -2894,7 +2894,7 @@ Joined domain MEGANET2.
 
         Sharename      Type      Comment
         ---------      ----      -------
-        IPC$           IPC       IPC Service (Samba 3.0.15)
+        IPC$           IPC       IPC Service (Samba 3.0.20)
         accounts       Disk      Accounting Files
         service        Disk      Financial Services Files
         pidata         Disk      Property Insurance Files
@@ -2902,11 +2902,11 @@ Joined domain MEGANET2.
         netlogon       Disk      Network Logon Service
         profiles       Disk      Profile Share
         profdata       Disk      Profile Data Share
-        ADMIN$         IPC       IPC Service (Samba 3.0.15)
+        ADMIN$         IPC       IPC Service (Samba 3.0.20)
 
         Server               Comment
         ---------            -------
-        MASSIVE              Samba 3.0.15
+        MASSIVE              Samba 3.0.20
 
         Workgroup            Master
         ---------            -------
diff --git a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
index 00104aa1cc..a56a8c8fca 100644
--- a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
@@ -321,9 +321,9 @@ done
 		<member><para>openldap2-devel (only for Samba compilation)</para></member>
 		<member><para>openldap2</para></member>
 		<member><para>pam_ldap</para></member>
-		<member><para>samba-3.0.15 or later</para></member>
-		<member><para>samba-client-3.0.15 or later</para></member>
-		<member><para>samba-winbind-3.0.15 or later</para></member>
+		<member><para>samba-3.0.20 or later</para></member>
+		<member><para>samba-client-3.0.20 or later</para></member>
+		<member><para>samba-winbind-3.0.20 or later</para></member>
 		<member><para>smbldap-tools Version 0.8.8</para></member>
 	</simplelist>
 
diff --git a/docs/Samba-Guide/SBE-SecureOfficeServer.xml b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
index 43ad079df9..e21776fbe9 100644
--- a/docs/Samba-Guide/SBE-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
@@ -846,10 +846,10 @@ echo -e "\nNAT firewall done.\n"
 	<procedure>
 		<step><para>
 		Install the Samba-3 binary RPM from the Samba-Team FTP site. Assuming that the binary
-		RPM file is called <filename>samba-3.0.15-1.i386.rpm</filename>, one way to install this
+		RPM file is called <filename>samba-3.0.20-1.i386.rpm</filename>, one way to install this
 		file is as follows:
 <screen>
-&rootprompt; rpm -Uvh samba-3.0.15-1.i386.rpm
+&rootprompt; rpm -Uvh samba-3.0.20-1.i386.rpm
 </screen>
 		This operation must be performed while logged in as the <command>root</command> user.
 		Successful operation is clearly indicated. If this installation should fail for any reason,
@@ -1979,13 +1979,13 @@ $rootprompt; ps ax | grep winbind
 
         Sharename      Type      Comment
         ---------      ----      -------
-        IPC$           IPC       IPC Service (Samba 3.0.15)
+        IPC$           IPC       IPC Service (Samba 3.0.20)
         netlogon       Disk      Network Logon Service
         profiles       Disk      Profile Share
         accounts       Disk      Accounting Files
         service        Disk      Financial Services Files
         apps           Disk      Application Files
-        ADMIN$         IPC       IPC Service (Samba 3.0.15)
+        ADMIN$         IPC       IPC Service (Samba 3.0.20)
         hplj6a         Printer   hplj6a
         hplj6f         Printer   hplj6f
         qmsa           Printer   qmsa
@@ -1993,7 +1993,7 @@ $rootprompt; ps ax | grep winbind
 
         Server               Comment
         ---------            -------
-        DIAMOND              Samba CVS 3.0.15
+        DIAMOND              Samba CVS 3.0.20
 
         Workgroup            Master
         ---------            -------
diff --git a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
index 6317b4c061..2fc10b69ec 100644
--- a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
@@ -85,7 +85,7 @@
 	Mr. Bob Jordan has asked you to install the new server as economically as possible. The central
 	server has a Pentium-IV 1.6GHz CPU, 768MB RAM, a 20GB IDE boot drive, a 160GB IDE second disk
 	to store plans, and a 100-base-T Ethernet card. You have already installed Red Hat Fedora CoreX and
-	have upgraded Samba to version 3.0.15 using the RPM package that is provided from the Samba
+	have upgraded Samba to version 3.0.20 using the RPM package that is provided from the Samba
 	<ulink url="http://www.samba.org">FTP</ulink> sites. (Note: Fedora CoreX indicates your favorite
 	version.)
 	</para>
@@ -139,7 +139,7 @@
 
 		<para>
 		It is assumed that the server is fully installed and ready for installation and 
-		configuration of Samba 3.0.15 and any support files needed. All TCP/IP addresses 
+		configuration of Samba 3.0.20 and any support files needed. All TCP/IP addresses 
 		have been hard-coded. In our case the IP address of the Samba server is 
 		<constant>192.168.1.1</constant> and the netmask is <constant>255.255.255.0</constant>. 
 		The hostname of the server used is <constant>server</constant>.
@@ -159,7 +159,7 @@
 			Install the RPM package using either the Red Hat Linux preferred GUI
 			tool or the <command>rpm</command>:
 <screen>
-&rootprompt; rpm -Uvh samba-3.0.15-1.i386.rpm
+&rootprompt; rpm -Uvh samba-3.0.20-1.i386.rpm
 </screen>
 			</para></step>
 
@@ -206,6 +206,9 @@
 <screen>
 192.168.1.1	server
 </screen>
+
+<?latex \newpage ?>
+
 			</para></step>
 
 			<step><para>
@@ -277,12 +280,12 @@
         Sharename     Type     Comment
         ---------     ----     -------
         Plans         Disk
-        IPC$          IPC      IPC Service (Samba 3.0.15)
-        ADMIN$        IPC      IPC Service (Samba 3.0.15)
+        IPC$          IPC      IPC Service (Samba 3.0.20)
+        ADMIN$        IPC      IPC Service (Samba 3.0.20)
 
         Server             Comment
         ---------          -------
-        SERVER             Samba 3.0.15
+        SERVER             Samba 3.0.20
 
         Workgroup          Master
         ---------          --------
@@ -385,7 +388,7 @@
 	5 PS printers that are network connected.  The second printer is to be used for general
 	office and letter printing. Your recommendation to allow only the Linux server to print directly
 	to the printers was accepted. You have supplied SUSE Enterprise Linux Server 9 and
-	have upgraded Samba to version 3.0.15.
+	have upgraded Samba to version 3.0.20.
 	</para>
 
 		<sect3>
@@ -466,7 +469,7 @@
 
 		<para>
 		It is assumed that the server is fully installed and ready for configuration of
-		Samba 3.0.15 and for necessary support files. All TCP/IP addresses should be hard-coded.
+		Samba 3.0.20 and for necessary support files. All TCP/IP addresses should be hard-coded.
 		In our case, the IP address of the Samba server is 192.168.1.1 and the netmask is
 		255.255.255.0. The hostname of the server used is <constant>server</constant>.
 		The office network is built as shown in <link linkend="charitynet"/>.
@@ -477,6 +480,8 @@
 			<imagefile scale="80">Charity-Network</imagefile>
 		</image>
 
+<?latex \newpage ?>
+
 		<procedure>
 		<title>Samba Server Configuration</title>
 
@@ -555,10 +560,9 @@ Password changed
 				directories are created with the same owner and group as the directory in which they are
 				created. Any new directories created still have the same owner, group, and permissions as the
 				directory they are in. This should eliminate all permissions-based file access problems.  For
-				more information on this subject, refer to The Official Samba-3 HOWTO and Reference Guide
-				(<emphasis>TOSHARG)</emphasis>, Chapter on: <emphasis>File, Directory and Share Access
-				Controls</emphasis>, or refer to the UNIX man page for the <command>chmod</command> and the
-				<command>chown</command> commands.
+				more information on this subject, refer to TOSHARG<footnote>The Official Samba-3 HOWTO and
+				Reference Guide, Chapter 15, File, Directory and Share Access Controls.</footnote> or refer
+				to the UNIX man page for the <command>chmod</command> and the <command>chown</command> commands.
 				</para></step>
 
 				<step><para>
@@ -897,7 +901,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 
 	<para>
 	<indexterm><primary>Red Hat Linux</primary></indexterm>
-	The new server will run Red Hat Fedora Core2. You should install Samba-3.0.15 and 
+	The new server will run Red Hat Fedora Core2. You should install Samba-3.0.20 and 
 	copy all files from the old system to the new one. The existing Windows NT4 server has a parallel
 	port HP LaserJet 4 printer that is shared by all. The printer driver is installed on each
 	workstation. You must not change anything on the workstations. Mr. Meany gave instructions to
@@ -1481,11 +1485,12 @@ application/octet-stream
 
 		<para>
 		Under normal circumstances, the NT/200x client attempts to open the network printer using MS-RPC. Because the client 
-		considers the printer to be local, it attempts to issue the <parameter>OpenPrinterEx()</parameter> call requesting access rights associated 
-		with the logged on user. If the user possesses local administrator rights but not root privilege on the Samba host (often 
-		the case), the <parameter>OpenPrinterEx()</parameter> call fails. The result is that the client now displays an <quote>Access Denied; Unable 
-		to connect</quote> message in the printer queue window (even though jobs may be printed successfully). This parameter MUST
-		not be enabled on a print share that has a valid print driver installed on the Samba server.
+		considers the printer to be local, it attempts to issue the <parameter>OpenPrinterEx()</parameter> call requesting
+		access rights associated with the logged on user. If the user possesses local administrator rights but not root
+		privilege on the Samba host (often the case), the <parameter>OpenPrinterEx()</parameter> call fails. The result is
+		that the client now displays an <quote>Access Denied; Unable to connect</quote> message in the printer queue window
+		(even though jobs may be printed successfully). This parameter MUST not be enabled on a print share that has a valid
+		print driver installed on the Samba server.
 		</para>
 
 	</answer>
diff --git a/docs/Samba-Guide/SBE-TheSmallOffice.xml b/docs/Samba-Guide/SBE-TheSmallOffice.xml
index 66ab51e582..15e6c2deb7 100644
--- a/docs/Samba-Guide/SBE-TheSmallOffice.xml
+++ b/docs/Samba-Guide/SBE-TheSmallOffice.xml
@@ -808,7 +808,7 @@ $rootprompt; ps ax | grep winbind
 
         Server               Comment
         ---------            -------
-        SLEETH               Samba 3.0.15
+        SLEETH               Samba 3.0.20
 
         Workgroup            Master
         ---------            -------
@@ -985,7 +985,7 @@ smb: \> q
 
 		<para>
 		In this network design and implementation exercise, you have created a Windows NT4 style Domain
-		Controller using Samba-3.0.15. As a result of following these guidelines meant that you experienced
+		Controller using Samba-3.0.20. As a result of following these guidelines meant that you experienced
 		and implemented several important aspects of Windows networking. In the next chapter of this book,
 		you build on the experience gained. These are the highlights from this chapter:
 		</para>
diff --git a/docs/Samba-Guide/SBE-UpgradingSamba.xml b/docs/Samba-Guide/SBE-UpgradingSamba.xml
index a99b28ee9c..6ce1df51b7 100644
--- a/docs/Samba-Guide/SBE-UpgradingSamba.xml
+++ b/docs/Samba-Guide/SBE-UpgradingSamba.xml
@@ -441,8 +441,8 @@ Build environment:
    Built on:    Mon Apr 11 20:23:27 MDT 2005
    Built using: gcc
    Build host:  Linux frodo 2.6...
-   SRCDIR:      /usr/src/packages/BUILD/samba-3.0.15/source
-   BUILDDIR:    /usr/src/packages/BUILD/samba-3.0.15/source
+   SRCDIR:      /usr/src/packages/BUILD/samba-3.0.20/source
+   BUILDDIR:    /usr/src/packages/BUILD/samba-3.0.20/source
 
 Paths:
    SBINDIR: /usr/sbin