Final Addition. Copy layout is next.

(This used to be commit 6e81f1b33945fb4271172ed91c18a2a164bc5dff)

11 files changed, 44 insertions, 36 deletions

diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
index 77cfa92a01..9756e33334 100644
--- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
@@ -1976,7 +1976,7 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
 
 		<para>
 		Oh, I did not think you would notice that. It is there so that it can be used. This is more fully discussed
-		in <emphasis>TOSHARG</emphasis>, which has a full chapter dedicated to the subject. While we are on the 
+		in <emphasis>TOSHARG2</emphasis>, which has a full chapter dedicated to the subject. While we are on the 
 		subject, it should be noted that you should definitely not use SWAT on any system that makes use 
 		of &smb.conf; <parameter>include</parameter> files because SWAT optimizes them out into an aggregated 
 		file but leaves in place a broken reference to the top-layer include file. SWAT was not designed to 
diff --git a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml
index 7415da34b9..15a228ae5b 100644
--- a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml
+++ b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml
@@ -1855,7 +1855,7 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash
         In the case of an NT4 or Samba-3-style domain the <parameter>realm</parameter> is not used, and the
         command used to join the domain is <command>net rpc join</command>. The above example also demonstrates
         advanced error reporting techniques that are documented in the chapter called "Reporting Bugs" in
-	<quote>The Official Samba-3 HOWTO and Reference Guide</quote> (TOSHARG).
+	<quote>The Official Samba-3 HOWTO and Reference Guide, Second Edition</quote> (TOSHARG2).
         </para>
 
         <para>
diff --git a/docs/Samba3-ByExample/SBE-Appendix1.xml b/docs/Samba3-ByExample/SBE-Appendix1.xml
index da42a4e054..fe321f8929 100644
--- a/docs/Samba3-ByExample/SBE-Appendix1.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix1.xml
@@ -1605,7 +1605,7 @@ REGEDIT4
 	</para>
 
 	<para>
-	Comprehensive coverage of file and record-locking controls is provided in TOSHARG, Chapter 13.
+	Comprehensive coverage of file and record-locking controls is provided in TOSHARG2, Chapter 13.
 	The information in that chapter was obtained from a wide variety of sources.
 	</para>
 
diff --git a/docs/Samba3-ByExample/SBE-Appendix2.xml b/docs/Samba3-ByExample/SBE-Appendix2.xml
index 0a73100d3a..395c843916 100644
--- a/docs/Samba3-ByExample/SBE-Appendix2.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix2.xml
@@ -118,9 +118,9 @@
 	</para>
 
 	<para>
-	Recommended preparatory reading: <emphasis>The Official Samba-3 HOWTO and Reference Guide</emphasis> (TOSHARG) 
-	Chapter 9, <quote>Network Browsing,</quote> and Chapter 3, <quote>Server Types and 
-	Security Modes.</quote>
+	Recommended preparatory reading: <emphasis>The Official Samba-3 HOWTO and Reference Guide, Second
+	Edition</emphasis> (TOSHARG2) Chapter 9, <quote>Network Browsing,</quote> and Chapter 3,
+	<quote>Server Types and Security Modes.</quote>
 	</para>
 
 	<sect2>
@@ -686,7 +686,7 @@
 
 	  	<para>
 		<indexterm><primary>IPC$</primary></indexterm>
-		The <constant>IPC$</constant> share serves a vital purpose<footnote><para>TOSHARG, Sect 4.5.1</para></footnote> 
+		The <constant>IPC$</constant> share serves a vital purpose<footnote><para>TOSHARG2, Sect 4.5.1</para></footnote> 
 		in SMB/CIFS-based networking.  A Windows client connects to this resource to obtain the list of 
 		resources that are available on the server. The server responds with the shares and print queues that
 		are available. In most but not all cases, the connection is made with a <constant>NULL</constant>
@@ -947,7 +947,7 @@
 		database and thus must be stored elsewhere on the UNIX system in a manner that Samba can
 		use. Samba-2.x permitted such encrypted passwords to be stored in the <constant>smbpasswd</constant>
 		file or in an LDAP database. Samba-3 permits use of multiple <parameter>passdb backend</parameter>
-		databases in concurrent deployment. Refer to <emphasis>TOSHARG</emphasis>, Chapter 10, <quote>Account Information Databases.</quote>
+		databases in concurrent deployment. Refer to <emphasis>TOSHARG2</emphasis>, Chapter 10, <quote>Account Information Databases.</quote>
 		</para></listitem>
 	</itemizedlist>
 
@@ -1010,7 +1010,7 @@
 		<indexterm><primary>DMB</primary></indexterm>
 		This is a broadcast announcement by which the Windows machine is attempting to
 		locate a Domain Master Browser (DMB) in the event that it might exist on the network.
-		Refer to <emphasis>TOSHARG,</emphasis> Chapter 9, Section 9.7, <quote>Technical Overview of Browsing,</quote>
+		Refer to <emphasis>TOSHARG2,</emphasis> Chapter 9, Section 9.7, <quote>Technical Overview of Browsing,</quote>
 		for details regarding the function of the DMB and its role in network browsing.
 		</para>
 
@@ -1151,10 +1151,10 @@
 		<para>
 		<indexterm><primary>WINS</primary></indexterm>
 		<indexterm><primary>NetBIOS</primary></indexterm>
-		Yes, there are two ways to do this. The first involves use of WINS (See <emphasis>TOSHARG</emphasis>, Chapter 9, 
+		Yes, there are two ways to do this. The first involves use of WINS (See <emphasis>TOSHARG2</emphasis>, Chapter 9, 
 		Section 9.5, <quote>WINS &smbmdash; The Windows Inter-networking Name Server</quote>); the
 		alternate method involves disabling the use of NetBIOS over TCP/IP. This second method requires
-		a correctly configured DNS server (see <emphasis>TOSHARG</emphasis>, Chapter 9, Section 9.3, <quote>Discussion</quote>).
+		a correctly configured DNS server (see <emphasis>TOSHARG2</emphasis>, Chapter 9, Section 9.3, <quote>Discussion</quote>).
 		</para>
 
 		<para>
diff --git a/docs/Samba3-ByExample/SBE-HighAvailability.xml b/docs/Samba3-ByExample/SBE-HighAvailability.xml
index db94af4d2f..4ad4c79851 100644
--- a/docs/Samba3-ByExample/SBE-HighAvailability.xml
+++ b/docs/Samba3-ByExample/SBE-HighAvailability.xml
@@ -531,7 +531,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.
 	<indexterm><primary>distributed</primary></indexterm>
 	Microsoft DFS (distributed file system) technology has been implemented in Samba. MSDFS permits
 	data to be accessed from a single share and yet to actually be distributed across multiple actual
-	servers. Refer to <emphasis>TOSHARG</emphasis>, Chapter 19, for information regarding
+	servers. Refer to <emphasis>TOSHARG2</emphasis>, Chapter 19, for information regarding
 	implementation of an MSDFS installation.
 	</para>
 
diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
index e489592ece..bfefce4d60 100644
--- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -3492,7 +3492,7 @@ structuralObjectClass: organizationalUnit
 	</para>
 
 	<para>
-	You should research the options for logon script implementation by referring to <emphasis>TOSHARG</emphasis>, Chapter 24,
+	You should research the options for logon script implementation by referring to <emphasis>TOSHARG2</emphasis>, Chapter 24,
 	Section 24.4. A quick Web search will bring up a host of options. One of the most popular logon
 	facilities in use today is called <ulink url="http://www.kixtart.org">KiXtart</ulink>.
 	</para>
@@ -4248,7 +4248,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 		<para>
 		There are people in the Linux and open source community who feel that SWAT is dangerous
 		and insecure. Many will not touch it with a barge-pole. By not introducing SWAT, I
-		hope to have brought their interests on board. SWAT is well covered is <emphasis>TOSHARG</emphasis>.
+		hope to have brought their interests on board. SWAT is well covered is <emphasis>TOSHARG2</emphasis>.
 		</para>
 
 	</answer>
diff --git a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
index 5459be6807..2b29b42d2f 100644
--- a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
@@ -520,9 +520,9 @@ Given 500 Users and 2 years:
 		<listitem><para>
 		<indexterm><primary>User Mode</primary></indexterm>
 		The &smb.conf; file specifies that the Samba server will operate in (default) <parameter>
-		security = user</parameter> mode<footnote><para>See <emphasis>TOSHARG</emphasis>, Chapter 3.
+		security = user</parameter> mode<footnote><para>See <emphasis>TOSHARG2</emphasis>, Chapter 3.
 		This is necessary so that Samba can act as a Domain Controller (PDC); see
-		<emphasis>TOSHARG</emphasis>, Chapter 4, for additional information.</para></footnote>
+		<emphasis>TOSHARG2</emphasis>, Chapter 4, for additional information.</para></footnote>
 		(User Mode).
 		</para></listitem>
 
@@ -1908,7 +1908,7 @@ $rootprompt; ps ax | grep winbind
 14295 ?        S     0:00 /usr/sbin/winbindd -B
 </screen>
 			The <command>winbindd</command> daemon is running in split mode (normal), so there are also
-			two instances<footnote><para>For more information regarding winbindd, see <emphasis>TOSHARG</emphasis>, 
+			two instances<footnote><para>For more information regarding winbindd, see <emphasis>TOSHARG2</emphasis>, 
 			Chapter 23, Section 23.3. The single instance of <command>smbd</command> is normal. One additional
 			<command>smbd</command> slave process is spawned for each SMB/CIFS client 
 			connection.</para></footnote> of it.
@@ -2452,7 +2452,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 		</para>
 
 		<para>
-		The guideline provided in <emphasis>TOSHARG</emphasis>, Chapter 10, Section 10.1.2,
+		The guideline provided in <emphasis>TOSHARG2</emphasis>, Chapter 10, Section 10.1.2,
 		is to limit the number of accounts in the tdbsam backend to 250. This is the point
 		at which most networks tend to want backup domain controllers (BDCs). Samba-3 does
 		not provide a mechanism for replicating tdbsam data so it can be used by a BDC. The
@@ -2630,7 +2630,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 		expression that may be up to 1024 characters in length and that represents an IP address. 
 		A NetBIOS name is always 16 characters long. The 16<superscript>th</superscript> character
 		is a name type indicator. A specific name type is registered<footnote><para>
-		See <emphasis>TOSHARG</emphasis>, Chapter 9, for more information.</para></footnote> for each 
+		See <emphasis>TOSHARG2</emphasis>, Chapter 9, for more information.</para></footnote> for each 
 		type of service that is provided by the Windows server or client and that may be registered
 		where a WINS server is in use.
 		</para>
@@ -2651,7 +2651,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 
 		<para>
 		Windows 200x Active Directory requires the registration in the DNS zone for the domain it 
-		controls of service locator<footnote><para>See TOSHARG, Chapter 9, Section 9.3.3.</para></footnote> records 
+		controls of service locator<footnote><para>See TOSHARG2, Chapter 9, Section 9.3.3.</para></footnote> records 
 		that Windows clients and servers will use to locate Kerberos and LDAP services. ADS also 
 		requires the registration of special records that are called global catalog (GC) entries 
 		and site entries by which domain controllers and other essential ADS servers may be located. 
diff --git a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
index 9996a7de13..d3acd9d1da 100644
--- a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
@@ -18,8 +18,8 @@
 	This chapter lays the groundwork for understanding the basics of Samba operation. 
 	Instead of a bland technical discussion, each principle is demonstrated by way of a 
 	real-world scenario for which a working solution<footnote><para>The examples given mirror those documented
-	in The Official Samba-3 HOWTO and Reference Guide (TOSHARG) Chapter 2, Section 2.3.1. You may gain additional
-	insight from the standalone server configurations covered in TOSHARG, sections 2.3.1.2 through 2.3.1.4.
+	in The Official Samba-3 HOWTO and Reference Guide, Second Edition (TOSHARG2) Chapter 2, Section 2.3.1. You may gain additional
+	insight from the standalone server configurations covered in TOSHARG2, sections 2.3.1.2 through 2.3.1.4.
 	</para></footnote> is fully described.
 	</para>
 
@@ -548,7 +548,7 @@ Password changed
 /data/officefiles/invitations
 /data/officefiles/misc
 </programlisting>
-				<indexterm><primary>TOSHARG</primary></indexterm>
+				<indexterm><primary>TOSHARG2</primary></indexterm>
 				The <command>chown</command> operation sets the owner to the user <constant>abmas</constant>
 				and the group to <constant>office</constant> on all directories just created.  It recursively
 				sets the permissions so that the owner and group have SUID/SGID with read, write, and execute
@@ -556,7 +556,7 @@ 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 TOSHARG<footnote>The Official Samba-3 HOWTO and
+				more information on this subject, refer to TOSHARG2<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>
diff --git a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
index a599f6fe30..59c5963794 100644
--- a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
+++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
@@ -224,7 +224,7 @@
 		of this package may have been patched to resolve this bug.  If your operating
 		platform has this bug, it means that attempts to add a Windows Domain Group that
 		has either a space or uppercase characters in it will fail. See
-		<emphasis>TOSHARG</emphasis>, Chapter 11, Section 11.3.1, Example 11.1, for
+		<emphasis>TOSHARG2</emphasis>, Chapter 11, Section 11.3.1, Example 11.1, for
 		more information.
 		</para>
 
@@ -772,8 +772,9 @@ $rootprompt; ps ax | grep winbind
 14295 ?        S     0:00 /usr/sbin/winbindd -B
 </screen>
 			The <command>winbindd</command> daemon is running in split mode (normal), so there are also
-			two instances of it. For more information regarding <command>winbindd</command>, see <emphasis>TOSHARG</emphasis>,
-			Chapter 23, Section 23.3. The single instance of <command>smbd</command> is normal.
+			two instances of it. For more information regarding <command>winbindd</command>, see
+			<emphasis>TOSHARG2</emphasis>, Chapter 23, Section 23.3. The single instance of
+			<command>smbd</command> is normal.
 			</para></step>
 	
 			<step><para>
diff --git a/docs/Samba3-ByExample/SBE-glossary.xml b/docs/Samba3-ByExample/SBE-glossary.xml
index 1066d253c7..bb63b0426d 100644
--- a/docs/Samba3-ByExample/SBE-glossary.xml
+++ b/docs/Samba3-ByExample/SBE-glossary.xml
@@ -227,13 +227,13 @@
 	</glossentry>
 
 	<glossentry>
-		<glossterm>The Official Samba-3 HOWTO and Reference Guide</glossterm>
-		<acronym>TOSHARG</acronym>
+		<glossterm>The Official Samba-3 HOWTO and Reference Guide, Second Edition</glossterm>
+		<acronym>TOSHARG2</acronym>
 		<glossdef><para>
-		This book makes repeated reference to <quote>The Official Samba-3 HOWTO and Reference Guide</quote>
-		by John H. Terpstra and Jelmer R. Vernooij. This publication is available from
-		Amazon.com. Publisher: Prentice Hall PTR (October 2003),
-		ISBN: 0131453556.
+		This book makes repeated reference to <quote>The Official Samba-3 HOWTO and Reference Guide, Second
+		Edition</quote> by John H. Terpstra and Jelmer R. Vernooij. This publication is available from
+		Amazon.com. Publisher: Prentice Hall PTR (August 2005),
+		ISBN: 013122282.
 		</para></glossdef>
 	</glossentry>
 
diff --git a/docs/Samba3-ByExample/conventions.xml b/docs/Samba3-ByExample/conventions.xml
index 069f8abbe0..1b3848405c 100644
--- a/docs/Samba3-ByExample/conventions.xml
+++ b/docs/Samba3-ByExample/conventions.xml
@@ -11,9 +11,16 @@
     <itemizedlist>
       <listitem>
 	<para>
-	TOSHARG is used as an abbreviation for the book, <emphasis>The Official Samba-3
-	HOWTO and Reference Guide,</emphasis> Editors: John H. Terpstra and Jelmer R. Vernooij,
-	Publisher: Prentice Hall PTR, www.phptr.com/perens.
+	TOSHARG2 is used as an abbreviation for the book, <quote>The Official Samba-3
+	HOWTO and Reference Guide, Second Edition</quote> Editors: John H. Terpstra and Jelmer R. Vernooij,
+	Publisher: Prentice Hall, ISBN: 0131882228.
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	S3bE2 is used as an abbreviation for the book, <quote>Samba-3 by Example, Second Edition</quote> 
+	Editors: John H. Terpstra, Publisher: Prentice Hall, ISBN: 013188221X.
 	</para>
       </listitem>