Begin of another reorg.

(This used to be commit 131d76df85ab12f5a171120113d4dfa7ad3f2220)

16 files changed, 144 insertions, 63 deletions

diff --git a/docs/Samba-Guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/SBE-2000UserNetwork.xml
index 870a060549..870a060549 100644
--- a/docs/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-2000UserNetwork.xml
diff --git a/docs/Samba-Guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/SBE-500UserNetwork.xml
index 74645bccb7..74645bccb7 100644
--- a/docs/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-500UserNetwork.xml
diff --git a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
index 8ed4f1dc91..8ed4f1dc91 100644
--- a/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/SBE-AddingUNIXClients.xml
diff --git a/docs/Samba-Guide/Chap12-Appendix.xml b/docs/Samba-Guide/SBE-Appendix1.xml
index 362f873a32..362f873a32 100644
--- a/docs/Samba-Guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/SBE-Appendix1.xml
diff --git a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/SBE-Appendix2.xml
index 331477b5ea..45d9711940 100644
--- a/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/SBE-Appendix2.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<chapter id="primer">
+<appendix id="primer">
   <title>Networking Primer</title>
 
-<?latex \pagenumbering{arabic} ?>
-
 	<para>
 	You are about to use the equivalent of a microscope to look at the information
 	that runs through the veins of a Windows network. We do more to observe the information than
@@ -1275,5 +1273,5 @@
 
 </sect1>
 
-</chapter>
+</appendix>
 
diff --git a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/SBE-DomainAppsSupport.xml
index 7079cc718b..7079cc718b 100644
--- a/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
+++ b/docs/Samba-Guide/SBE-DomainAppsSupport.xml
diff --git a/docs/Samba-Guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/SBE-HighAvailability.xml
index 61990592be..61990592be 100644
--- a/docs/Samba-Guide/Chap11-HighAvailability.xml
+++ b/docs/Samba-Guide/SBE-HighAvailability.xml
diff --git a/docs/Samba-Guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/SBE-KerberosFastStart.xml
index bcd00dbd86..bcd00dbd86 100644
--- a/docs/Samba-Guide/Chap10-KerberosFastStart.xml
+++ b/docs/Samba-Guide/SBE-KerberosFastStart.xml
diff --git a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
index d6c746658f..d6c746658f 100644
--- a/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
diff --git a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
index 75a0213ade..75a0213ade 100644
--- a/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
diff --git a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
index 883a2447a6..883a2447a6 100644
--- a/docs/Samba-Guide/Chap08b-MigrateNW4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNW4Samba3.xml
diff --git a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
index 4ceb6de671..4ceb6de671 100644
--- a/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
diff --git a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
index 0b641702f7..3f1539cc11 100644
--- a/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
@@ -3,9 +3,14 @@
 <chapter id="simple">
   <title>No Frills Samba Servers</title>
 
+<?latex \pagenumbering{arabic} ?>
+
 	<para>
-	Congratulations, you managed to get past the opening chapter. To some, this is where the interesting
-	exercises begin. This is the start of the real journey toward the Samba deployment of a lifetime.
+	This is the start of the real journey toward the successful deployment of Samba. For some this is chapter
+	is the end of the road bacause their needs will have been adequately met. For others, this chapter is
+	the beginning of a journey that will take them well past the contents of this book. This book provides
+	example configurations of, for the greater part, complete networking solutions. The intent of this book
+	is to help you to get your Samba installation working with least pain and agony.
 	</para>
 
 <sect1>
diff --git a/docs/Samba-Guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/SBE-TheSmallOffice.xml
index ee68508934..ee68508934 100644
--- a/docs/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/SBE-TheSmallOffice.xml
diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml
index 9b578b68f0..a0b0a41070 100644
--- a/docs/Samba-Guide/index.xml
+++ b/docs/Samba-Guide/index.xml
@@ -9,42 +9,110 @@
 		<authorgroup>

 			<author>&person.jht;</author>

 		</authorgroup>

-		<pubdate>March 4, 2005</pubdate>

+		<pubdate>April 12, 2005</pubdate>

 	</bookinfo>

 	<?latex \clearpage ?>

-<!--- Leave the commented out lines they are needed for book production.

-	<para>boo</para>

-	<?latex \clearpage ?>

-	<para>boo</para>

-	<?latex \clearpage ?>

-	<para>boo</para>

--->

+	<?latex \setcounter{page}{5} ?>

+

 	<xi:include href="inside-cover.xml"/>

 	<xi:include href="acknowledgements.xml"/>

 	<xi:include href="foreword.xml"/>

 	<xi:include href="preface.xml"/>

+

 	<?latex \cleardoublepage ?>

+

 	<toc/>

+

 	<?latex \cleardoublepage ?>

+

 	<?latex \listofexamples ?>

+

 	<?latex \cleardoublepage ?>

+

 	<lot/>

+

 	<!-- Chapters -->

-	<xi:include href="Chap01-WindowsNetworkingPrimer.xml"/>

-	<xi:include href="Chap02-SimpleOfficeServer.xml"/>

-	<xi:include href="Chap03-TheSmallOffice.xml"/>

-	<xi:include href="Chap04-SecureOfficeServer.xml"/>

-	<xi:include href="Chap05-500UserNetwork.xml"/>

-	<xi:include href="Chap06-MakingHappyUsers.xml"/>

-	<xi:include href="Chap07-2000UserNetwork.xml"/>

-	<xi:include href="Chap08-MigrateNT4Samba3.xml"/>

-	<xi:include href="Chap08b-MigrateNW4Samba3.xml"/>

-	<xi:include href="Chap09-AddingUNIXClients.xml"/>

-	<xi:include href="Chap10-KerberosFastStart.xml"/>

-	<xi:include href="Chap10b-DomainAppsSupport.xml"/>

-	<xi:include href="Chap11-HighAvailability.xml"/>

-	<xi:include href="Chap12-Appendix.xml"/>

+

+<part id="ExNetworks">

+<title>Example Network Configurations</title>

+<partintro>

+<title>Example Network Configurations</title>

+

+<?latex \pagenumbering{arabic} ?>

+

+<para>

+This section of <emphasis>Samba-3 by Example</emphasis> provides example network

+configurations that can be copied, or modified as needed, and deployed as-is.

+</para>

+

+<para>

+Best use can be made of this book by finding in this section the network design and

+layout that best approximates your estimated needs. It is recommended that you will

+implement the design pattern exactly as it appears, then after the installation has

+been proven to work make any changes or modifications needed at your site.

+</para>

+

+<para>

+The examples have been tested with Red Hat Fedora Core 2, Novell SUSE Linux Professional

+9.2 and Novell SUSE Linux Enterprise Server (SLES) 9. The principals of implementation

+apply to all Linux and UNIX systems in general, though some system files and tools will 

+be different and the location of some Samba file locations will be different since these 

+are determinered by the person who packages Samba for each platform.

+</para>

+

+</partintro>

+	<xi:include href="SBE-SimpleOfficeServer.xml"/>

+	<xi:include href="SBE-TheSmallOffice.xml"/>

+	<xi:include href="SBE-SecureOfficeServer.xml"/>

+	<xi:include href="SBE-500UserNetwork.xml"/>

+	<xi:include href="SBE-MakingHappyUsers.xml"/>

+	<xi:include href="SBE-2000UserNetwork.xml"/>

+</part>

+

+<part id="DMSMig">

+<title>Domain Membership and Migration</title>

+<partintro>

+<title>Domain Membership and Migration</title>

+

+<para>

+This section <emphasis>Samba-3 by Example</emphasis> covers two main topics: How to add

+Samba Domain Member Servers and Samba Domain Member Clients to a Samba domain, the other

+subject is that of how to migrate from and NT4 Domain, a NetWare server, or from an earlier

+Samba version to environments that use the most recent Samba-3 release. 

+</para>

+

+<para>

+Those who are making use of the chapter on Adding UNIX clients and servers running Samba

+to a Samba or a Windows networking domain may also benefit by referring to the book

+<emphasis>The Official Samba-3 HOWTO and Reference Guide.</emphasis>

+</para>

+

+</partintro>

+	<xi:include href="SBE-AddingUNIXClients.xml"/>

+	<xi:include href="SBE-MigrateNT4Samba3.xml"/>

+	<xi:include href="SBE-MigrateNW4Samba3.xml"/>

+</part>

+

+<part id="RefSection">

+<title>Reference Section</title>

+<partintro>

+<title>Reference Section</title>

+

+<para>

+This section <emphasis>Samba-3 by Example</emphasis> provides important reference material

+that may help you to solve network performance issues, to answer some of the critiques

+published regarding Samba, or just to gain a more broad understanding of how Samba can

+play in a Windows networking world.

+</para>

+

+</partintro>

+	<xi:include href="SBE-KerberosFastStart.xml"/>

+	<xi:include href="SBE-DomainAppsSupport.xml"/>

+	<xi:include href="SBE-HighAvailability.xml"/>

+	<xi:include href="SBE-Appendix1.xml"/>

+	<xi:include href="SBE-Appendix2.xml"/>

 	<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>

+</part>

 	<xi:include href="glossary.xml"/>

 	<index/>

 </book>

diff --git a/docs/Samba-Guide/preface.xml b/docs/Samba-Guide/preface.xml
index 49b2e5c377..5bde840dc8 100644
--- a/docs/Samba-Guide/preface.xml
+++ b/docs/Samba-Guide/preface.xml
@@ -78,7 +78,7 @@
 	</para>
 
 	<sect2>
-	<title>Samba 3.0.12 Update Edition</title>
+	<title>Samba 3.0.15 Update Edition</title>
 
 	<para>
 	The Samba 3.0.x series has been remarkably popular. At the time this book first
@@ -95,7 +95,7 @@
 	</para>
 
 	<table id="pref-new">
-		<title>Samba Changes &smbmdash; 3.0.2 to 3.0.12</title>
+		<title>Samba Changes &smbmdash; 3.0.2 to 3.0.15</title>
 		<tgroup cols="2">
 			<colspec align="left"/>
 			<colspec align="justify"/>
@@ -265,32 +265,25 @@
 	<title>Summary of Topics</title>
 
 	<para>
-	Our first assignment is to understand how Microsoft Windows products
-	function in the network environment. That is where we start. Let's take
-	just a few moments to get a bird's eye view of this book. Remember that
-	this is a book about file and print technology deployment; there are
-	great examples of printing solutions. Here we go.
+	The contents of this second edition of <emphasis>Samba-3 by Example</emphasis>
+	have been rearranged based on feedback from purchasers of the first edition.
 	</para>
 
-	<variablelist>
-		<varlistentry>
-		<term>Chapter 1 &smbmdash; Windows Networking Primer</term><listitem>
-		<para>
-		Here we cover practical exercises to help us to understand how MS Windows
-		network protocols function. A network protocol analyzer helps you to
-		appreciate the fact that Windows networking is highly dependent on broadcast
-		messaging. Additionally, you can look into network packets that a Windows
-		client sends to a network server to set up a network connection. On completion,
-		you should have a basic understanding of how network browsing functions and
-		have seen some of the information a Windows client sends to
-		a file and print server to create a connection over which file and print
-		operations may take place.
-		</para>
-		</listitem>
-		</varlistentry>
+	<para>
+	Clearly the first edition contained most of what was needed and that was missing
+	from other books that cover this difficult subject. The new arrangement adds
+	additional material to meet consumer requests and includeis changes that originated
+	as suggestions for improvement.
+	</para>
 
+	<para>
+	Chapter 1 now dives directly into the heart of the implementation of Windows
+	file and print server networks that use Samba at the heart.
+	</para>
+
+	<variablelist>
 		<varlistentry>
-		<term>Chapter 2 &smbmdash; No Frills Samba Servers</term><listitem>
+		<term>Chapter 1 &smbmdash; No Frills Samba Servers</term><listitem>
 		<para>
 		Here you design a solution for three different business scenarios, each for a 
 		company called Abmas. There are two simple networking problems and one slightly 
@@ -333,7 +326,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 3 &smbmdash; Small Office Networking</term><listitem>
+		<term>Chapter 2 &smbmdash; Small Office Networking</term><listitem>
 		<para>
 		Abmas is a successful company now. They have 50 network users
 		and want a little more varoom from the network. This is a typical
@@ -353,7 +346,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 4 &smbmdash; Secure Office Networking</term><listitem>
+		<term>Chapter 3 &smbmdash; Secure Office Networking</term><listitem>
 		<para>
 		Abmas is growing rapidly now. Money is a little tight, but with 130
 		network users, security has become a concern. They have many new machines
@@ -374,7 +367,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 5 &smbmdash; The 500 User Office</term><listitem>
+		<term>Chapter 4 &smbmdash; The 500 User Office</term><listitem>
 		<para>
 		The two-year projections were met. Congratulations, you are a star.
 		Now Abmas needs to replace the network. Into the existing user base, they
@@ -397,7 +390,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 6 &smbmdash; Making Users Happy</term><listitem>
+		<term>Chapter 5 &smbmdash; Making Users Happy</term><listitem>
 		<para>
 		Congratulations again. Abmas is happy with your services and you have been given another raise.
 		Your users are becoming much more capable and are complaining about little
@@ -421,7 +414,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 7 &smbmdash; A Distributed 2000-User Network</term><listitem>
+		<term>Chapter 6 &smbmdash; A Distributed 2000-User Network</term><listitem>
 		<para>
 		Only eight months have passed, and Abmas has acquired another company. You now need to expand
 		the network further. You have to deal with a network that spans several countries.
@@ -440,7 +433,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 8 &smbmdash; Migrating NT4 Domain to Samba-3</term><listitem>
+		<term>Chapter 7 &smbmdash; Migrating NT4 Domain to Samba-3</term><listitem>
 		<para>
 		Another six months have <?latex \linebreak ?>
 		 passed. Abmas has acquired yet another company. You will find a
@@ -457,7 +450,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 9 &smbmdash; Migrating NetWare 4.11 Server to Samba</term><listitem>
+		<term>Chapter 8 &smbmdash; Migrating NetWare 4.11 Server to Samba</term><listitem>
 		<para>
 		Misty Stanley-Jones has contributed information that summarizes her experience at migration
 		from a NetWare server to Samba-3.
@@ -471,7 +464,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 10 &smbmdash; Adding UNIX/Linux Servers and Clients</term><listitem>
+		<term>Chapter 9 &smbmdash; Adding UNIX/Linux Servers and Clients</term><listitem>
 		<para>
 		Well done, Bob, your team has achieved much. Now help Abmas integrate the entire network.
 		You want central control and central support and you need to cut costs. How can you reduce administrative
@@ -493,7 +486,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 11 &smbmdash; Active Directory, Kerberos and Security</term><listitem>
+		<term>Chapter 10 &smbmdash; Active Directory, Kerberos and Security</term><listitem>
 		<para>
 		Abmas has acquired another company that has just migrated to running Windows Server 2003 and 
 		Active Directory. One of your staff makes offhand comments that land you in hot water.
@@ -511,7 +504,7 @@
 		</varlistentry>
 
 		<varlistentry>
-                <term>Chapter 12 &smbmdash; Integrating Additional Services</term><listitem>
+                <term>Chapter 11 &smbmdash; Integrating Additional Services</term><listitem>
                 <para>
 		The battle is almost over, Samba-3 has won the day. Your team are delighted and now you
 		find yourself at yet another cross-roads. Abmas have acquired a snack food business, you
@@ -530,7 +523,7 @@
                 </varlistentry>
 
 		<varlistentry>
-		<term>Chapter 13 &smbmdash; Performance, Reliability and Availability</term><listitem>
+		<term>Chapter 12 &smbmdash; Performance, Reliability and Availability</term><listitem>
 		<para>
 		Bob, are you sure the new Samba server is up to the load? Your network is serving many
 		users who risk becoming unproductive. What can you do to keep ahead of demand? Can you
@@ -546,6 +539,23 @@
 		</para>
 		</listitem>
 		</varlistentry>
+
+		<varlistentry>
+		<term>Chapter 13 &smbmdash; Windows Networking Primer</term><listitem>
+		<para>
+		Here we cover practical exercises to help us to understand how MS Windows
+		network protocols function. A network protocol analyzer helps you to
+		appreciate the fact that Windows networking is highly dependent on broadcast
+		messaging. Additionally, you can look into network packets that a Windows
+		client sends to a network server to set up a network connection. On completion,
+		you should have a basic understanding of how network browsing functions and
+		have seen some of the information a Windows client sends to
+		a file and print server to create a connection over which file and print
+		operations may take place.
+		</para>
+		</listitem>
+		</varlistentry>
+
 	</variablelist>
 
   </sect1>