More updates in the reorg.

(This used to be commit 63a5f698ed546f35e48d366ffc71a4a8b5cd831a)

10 files changed, 36 insertions, 36 deletions

diff --git a/docs/Samba-Guide/SBE-2000UserNetwork.xml b/docs/Samba-Guide/SBE-2000UserNetwork.xml
index 870a060549..c24cc4d4a2 100644
--- a/docs/Samba-Guide/SBE-2000UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-2000UserNetwork.xml
@@ -380,7 +380,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.12 server. In the discussion that follows, use is made of
+	    Samba-3.0.15 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 8ed4f1dc91..3baa02e28e 100644
--- a/docs/Samba-Guide/SBE-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
@@ -1497,7 +1497,7 @@ logonCount: 13
 sAMAccountName: fran$
 sAMAccountType: 805306369
 operatingSystem: Samba
-operatingSystemVersion: 3.0.12-SUSE
+operatingSystemVersion: 3.0.15-SUSE
 dNSHostName: fran
 userPrincipalName: HOST/fran@LONDON.ABMAS.BIZ
 servicePrincipalName: CIFS/fran.london.abmas.biz
@@ -1645,7 +1645,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.12</smbconfoption>
+<smbconfoption name="server string">Samba 3.0.15</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 362f873a32..f30f689fbe 100644
--- a/docs/Samba-Guide/SBE-Appendix1.xml
+++ b/docs/Samba-Guide/SBE-Appendix1.xml
@@ -252,7 +252,7 @@ Paths:
 	If you wish to locate the Samba version, just run:
 <screen>
 &rootprompt; /path-to-binary-file/smbd -V
-Version 3.0.12-SUSE
+Version 3.0.15-SUSE
 </screen>
 	</para>
 
@@ -264,15 +264,15 @@ Version 3.0.12-SUSE
 	</indexterm>
 <screen>
 &rootprompt; rpm -qa | grep samba
-samba3-pdb-3.0.12-1
+samba3-pdb-3.0.15-1
 samba3-vscan-0.3.5-0
-samba3-winbind-3.0.12-1
-samba3-3.0.12-1
-samba3-python-3.0.12-1
-samba3-utils-3.0.12-1
-samba3-doc-3.0.12-1
-samba3-client-3.0.12-1
-samba3-cifsmount-3.0.12-1
+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
 	</screen><indexterm>
 	  <primary>package names</primary>
 	</indexterm>
diff --git a/docs/Samba-Guide/SBE-Appendix2.xml b/docs/Samba-Guide/SBE-Appendix2.xml
index 45d9711940..1d7dc1161b 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.12 running on a SUSE Enterprise Linux 9.</para></listitem>
+		<listitem><para>Samba-3.0.15 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 d6c746658f..fba1d78892 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
@@ -1344,7 +1344,7 @@ slapd[12164]: conn=1 fd=10 closed
 	</para>
 
 <note><para>
-The following information applies to Samba-3.0.12 when used with the Idealx smbldap-tools scripts
+The following information applies to Samba-3.0.15 when used with the Idealx smbldap-tools scripts
 version 0.8.7. 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.
 </para></note>
@@ -1751,8 +1751,8 @@ session  optional    pam_mail.so
 	<para><indexterm>
 	    <primary>Samba RPM Packages</primary>
 	  </indexterm>
-	Verify that the Samba-3.0.12 (or later) packages are installed on each SUSE Linux server 
-	before following the steps below. If Samba-3.0.12 (or later) is not installed, you have the
+	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
 	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 Enteprise Linux Server 3 and 4 are included on the CD-ROM that
diff --git a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
index 883a2447a6..d74f9ec954 100644
--- a/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
@@ -244,9 +244,9 @@
 		<member><para>nss_ldap</para></member>
 		<member><para>smbldap-tools Version 0.8.7</para></member>
 		<member><para>perl-ldap</para></member>
-		<member><para>samba-3.0.12 or later</para></member>
-		<member><para>samba-client-3.0.12 or later</para></member>
-		<member><para>samba-winbind-3.0.12 or later</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>
 	</simplelist>
 
 	<para>
diff --git a/docs/Samba-Guide/SBE-SecureOfficeServer.xml b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
index 4ceb6de671..d2e8521657 100644
--- a/docs/Samba-Guide/SBE-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
@@ -842,10 +842,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.12-1.i386.rpm</filename>, one way to install this
+		RPM file is called <filename>samba-3.0.15-1.i386.rpm</filename>, one way to install this
 		file is as follows:
 <screen>
-&rootprompt; rpm -Uvh samba-3.0.12-1.i386.rpm
+&rootprompt; rpm -Uvh samba-3.0.15-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,
@@ -1974,13 +1974,13 @@ $rootprompt; ps ax | grep winbind
 
         Sharename      Type      Comment
         ---------      ----      -------
-        IPC$           IPC       IPC Service (Samba 3.0.12)
+        IPC$           IPC       IPC Service (Samba 3.0.15)
         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.12)
+        ADMIN$         IPC       IPC Service (Samba 3.0.15)
         hplj6a         Printer   hplj6a
         hplj6f         Printer   hplj6f
         qmsa           Printer   qmsa
@@ -1988,7 +1988,7 @@ $rootprompt; ps ax | grep winbind
 
         Server               Comment
         ---------            -------
-        DIAMOND              Samba CVS 3.0.12
+        DIAMOND              Samba CVS 3.0.15
 
         Workgroup            Master
         ---------            -------
diff --git a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
index 3f1539cc11..404b9032d8 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 Core2 and
-	have upgraded Samba to version 3.0.12 using the RPM package that is provided from the Samba
+	have upgraded Samba to version 3.0.15 using the RPM package that is provided from the Samba
 	<ulink url="http://www.samba.org">FTP</ulink> sites.
 	</para>
 
@@ -140,7 +140,7 @@
 
 		<para>
 		It is assumed that the server is fully installed and ready for installation and 
-		configuration of Samba 3.0.12 and any support files needed. All TCP/IP addresses 
+		configuration of Samba 3.0.15 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 host name of the server used was <constant>server</constant>.
@@ -163,7 +163,7 @@
 			Install the RPM package as using either the Red Hat Linux preferred GUI
 			tool or using the <command>rpm</command>, as follows:
 <screen>
-&rootprompt; rpm -Uvh samba-3.0.12-1.i386.rpm
+&rootprompt; rpm -Uvh samba-3.0.15-1.i386.rpm
 </screen>
 			</para></step>
 
@@ -293,12 +293,12 @@
         Sharename     Type     Comment
         ---------     ----     -------
         Plans         Disk
-        IPC$          IPC      IPC Service (Samba 3.0.12)
-        ADMIN$        IPC      IPC Service (Samba 3.0.12)
+        IPC$          IPC      IPC Service (Samba 3.0.15)
+        ADMIN$        IPC      IPC Service (Samba 3.0.15)
 
         Server             Comment
         ---------          -------
-        SERVER             Samba 3.0.12
+        SERVER             Samba 3.0.15
 
         Workgroup          Master
         ---------          --------
@@ -409,7 +409,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.12.
+	have upgraded Samba to version 3.0.15.
 	</para>
 
 		<sect3>
@@ -495,7 +495,7 @@
 
 		<para>
 		It is assumed that the server is fully installed and ready for configuration of
-		Samba 3.0.12 and for necessary support files. All TCP/IP addresses should be hard coded.
+		Samba 3.0.15 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 host name of the server used was <constant>server</constant>.
 		The office network is built as shown in <link linkend="charitynet"/>.
@@ -943,7 +943,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.12 and 
+	The new server will run Red Hat Fedora Core2. You should install Samba-3.0.15 and 
 	copy all files off 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
diff --git a/docs/Samba-Guide/SBE-TheSmallOffice.xml b/docs/Samba-Guide/SBE-TheSmallOffice.xml
index ee68508934..5b06fca942 100644
--- a/docs/Samba-Guide/SBE-TheSmallOffice.xml
+++ b/docs/Samba-Guide/SBE-TheSmallOffice.xml
@@ -805,7 +805,7 @@ $rootprompt; ps ax | grep winbind
 
         Server               Comment
         ---------            -------
-        SLEETH               Samba 3.0.12
+        SLEETH               Samba 3.0.15
 
         Workgroup            Master
         ---------            -------
@@ -980,7 +980,7 @@ smb: \> q
 
 		<para>
 		In this network design and implementation exercise, you have created a Windows NT4 style Domain
-		Controller using Samba-3.0.12. As a result of following these guidelines meant that you experienced
+		Controller using Samba-3.0.15. 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-preface.xml b/docs/Samba-Guide/SBE-preface.xml
index 5bde840dc8..898b83ecc7 100644
--- a/docs/Samba-Guide/SBE-preface.xml
+++ b/docs/Samba-Guide/SBE-preface.xml
@@ -85,7 +85,7 @@
 	went to print samba-3.0.2 was being released. There have been significant modifications
 	and enhancements between samba-3.0.2 and samba-3.0.11 (the current release) that
 	necessitate this documentation update. This update has the specific intent to
-	refocus this book so that its guidance can be followed for samba-3.0.12
+	refocus this book so that its guidance can be followed for samba-3.0.15
 	and beyond. Further changes are expected as Samba-3 matures further and will 
 	be reflected in future updates.
 	</para>