More updates.

(This used to be commit 20f8bde1d0a2b2e42efedcdac21778fe34c0ab79)

47 files changed, 87 insertions, 118 deletions

diff --git a/docs/Samba-HOWTO-Collection/AccessControls.xml b/docs/Samba-HOWTO-Collection/TOSHARG-AccessControls.xml
index 251cc32fcc..251cc32fcc 100644
--- a/docs/Samba-HOWTO-Collection/AccessControls.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-AccessControls.xml
diff --git a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/TOSHARG-AdvancedNetworkAdmin.xml
index 72892f3806..72892f3806 100644
--- a/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-AdvancedNetworkAdmin.xml
diff --git a/docs/Samba-HOWTO-Collection/BDC.xml b/docs/Samba-HOWTO-Collection/TOSHARG-BDC.xml
index 7d4ff18dd7..7d4ff18dd7 100644
--- a/docs/Samba-HOWTO-Collection/BDC.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-BDC.xml
diff --git a/docs/Samba-HOWTO-Collection/Backup.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Backup.xml
index 7844fb13f2..7844fb13f2 100644
--- a/docs/Samba-HOWTO-Collection/Backup.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Backup.xml
diff --git a/docs/Samba-HOWTO-Collection/Bugs.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Bugs.xml
index ae4354f5d6..ae4354f5d6 100644
--- a/docs/Samba-HOWTO-Collection/Bugs.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Bugs.xml
diff --git a/docs/Samba-HOWTO-Collection/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/TOSHARG-CUPS-printing.xml
index aac9bc4999..aac9bc4999 100644
--- a/docs/Samba-HOWTO-Collection/CUPS-printing.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-CUPS-printing.xml
diff --git a/docs/Samba-HOWTO-Collection/Compiling.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Compiling.xml
index 9fbadfb661..9fbadfb661 100644
--- a/docs/Samba-HOWTO-Collection/Compiling.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Compiling.xml
diff --git a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml b/docs/Samba-HOWTO-Collection/TOSHARG-DNS-DHCP-Configuration.xml
index d693c7edf6..d693c7edf6 100644
--- a/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-DNS-DHCP-Configuration.xml
diff --git a/docs/Samba-HOWTO-Collection/Diagnosis.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Diagnosis.xml
index 9cf797a702..9cf797a702 100644
--- a/docs/Samba-HOWTO-Collection/Diagnosis.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Diagnosis.xml
diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/TOSHARG-DomainMember.xml
index 0c7689c32f..0c7689c32f 100644
--- a/docs/Samba-HOWTO-Collection/DomainMember.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-DomainMember.xml
diff --git a/docs/Samba-HOWTO-Collection/FastStart.xml b/docs/Samba-HOWTO-Collection/TOSHARG-FastStart.xml
index a50b4fa553..a50b4fa553 100644
--- a/docs/Samba-HOWTO-Collection/FastStart.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-FastStart.xml
diff --git a/docs/Samba-HOWTO-Collection/Further-Resources.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Further-Resources.xml
index 0a9d7d1cd5..0a9d7d1cd5 100644
--- a/docs/Samba-HOWTO-Collection/Further-Resources.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Further-Resources.xml
diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Group-Mapping.xml
index 68459cf2f0..68459cf2f0 100644
--- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Group-Mapping.xml
diff --git a/docs/Samba-HOWTO-Collection/HighAvailability.xml b/docs/Samba-HOWTO-Collection/TOSHARG-HighAvailability.xml
index 385646d91f..385646d91f 100644
--- a/docs/Samba-HOWTO-Collection/HighAvailability.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-HighAvailability.xml
diff --git a/docs/Samba-HOWTO-Collection/IDMAP.xml b/docs/Samba-HOWTO-Collection/TOSHARG-IDMAP.xml
index 0ea50280a7..0ea50280a7 100644
--- a/docs/Samba-HOWTO-Collection/IDMAP.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-IDMAP.xml
diff --git a/docs/Samba-HOWTO-Collection/Install.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Install.xml
index 60266274af..60266274af 100644
--- a/docs/Samba-HOWTO-Collection/Install.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Install.xml
diff --git a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Integrating-with-Windows.xml
index 0fa90c9cb2..0fa90c9cb2 100644
--- a/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Integrating-with-Windows.xml
diff --git a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/TOSHARG-InterdomainTrusts.xml
index 18f0d28454..18f0d28454 100644
--- a/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-InterdomainTrusts.xml
diff --git a/docs/Samba-HOWTO-Collection/IntroSMB.xml b/docs/Samba-HOWTO-Collection/TOSHARG-IntroSMB.xml
index 547a55f43a..547a55f43a 100644
--- a/docs/Samba-HOWTO-Collection/IntroSMB.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-IntroSMB.xml
diff --git a/docs/Samba-HOWTO-Collection/LargeFile.xml b/docs/Samba-HOWTO-Collection/TOSHARG-LargeFile.xml
index 44f054236e..44f054236e 100644
--- a/docs/Samba-HOWTO-Collection/LargeFile.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-LargeFile.xml
diff --git a/docs/Samba-HOWTO-Collection/NT4Migration.xml b/docs/Samba-HOWTO-Collection/TOSHARG-NT4Migration.xml
index 4f65b8c0a7..4f65b8c0a7 100644
--- a/docs/Samba-HOWTO-Collection/NT4Migration.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-NT4Migration.xml
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/TOSHARG-NetworkBrowsing.xml
index 6470295d66..6470295d66 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-NetworkBrowsing.xml
diff --git a/docs/Samba-HOWTO-Collection/Other-Clients.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Other-Clients.xml
index 0a0d78fd91..0a0d78fd91 100644
--- a/docs/Samba-HOWTO-Collection/Other-Clients.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Other-Clients.xml
diff --git a/docs/Samba-HOWTO-Collection/PAM.xml b/docs/Samba-HOWTO-Collection/TOSHARG-PAM.xml
index 4a09e808b4..4a09e808b4 100644
--- a/docs/Samba-HOWTO-Collection/PAM.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-PAM.xml
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
index 809d353833..809d353833 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-PDC.xml
diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Passdb.xml
index 2ee109db01..2ee109db01 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Passdb.xml
diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/TOSHARG-PolicyMgmt.xml
index c4fb0aeaaa..c4fb0aeaaa 100644
--- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-PolicyMgmt.xml
diff --git a/docs/Samba-HOWTO-Collection/Portability.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Portability.xml
index a5455a6c67..a5455a6c67 100644
--- a/docs/Samba-HOWTO-Collection/Portability.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Portability.xml
diff --git a/docs/Samba-HOWTO-Collection/Printing.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
index 1d2fc8eeb6..1d2fc8eeb6 100644
--- a/docs/Samba-HOWTO-Collection/Printing.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Printing.xml
diff --git a/docs/Samba-HOWTO-Collection/Problems.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Problems.xml
index 1aa065d1c8..1aa065d1c8 100644
--- a/docs/Samba-HOWTO-Collection/Problems.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Problems.xml
diff --git a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/TOSHARG-ProfileMgmt.xml
index 8b137dd4ef..8b137dd4ef 100644
--- a/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-ProfileMgmt.xml
diff --git a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml b/docs/Samba-HOWTO-Collection/TOSHARG-RightsAndPriviliges.xml
index a8c2811511..a8c2811511 100644
--- a/docs/Samba-HOWTO-Collection/RightsAndPriviliges.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-RightsAndPriviliges.xml
diff --git a/docs/Samba-HOWTO-Collection/SWAT.xml b/docs/Samba-HOWTO-Collection/TOSHARG-SWAT.xml
index 349312d61a..349312d61a 100644
--- a/docs/Samba-HOWTO-Collection/SWAT.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-SWAT.xml
diff --git a/docs/Samba-HOWTO-Collection/Securing.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Securing.xml
index b8d65c08ae..b8d65c08ae 100644
--- a/docs/Samba-HOWTO-Collection/Securing.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Securing.xml
diff --git a/docs/Samba-HOWTO-Collection/ServerType.xml b/docs/Samba-HOWTO-Collection/TOSHARG-ServerType.xml
index cd7f578cc0..cd7f578cc0 100644
--- a/docs/Samba-HOWTO-Collection/ServerType.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-ServerType.xml
diff --git a/docs/Samba-HOWTO-Collection/Speed.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Speed.xml
index 1e74a22396..1e74a22396 100644
--- a/docs/Samba-HOWTO-Collection/Speed.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Speed.xml
diff --git a/docs/Samba-HOWTO-Collection/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/TOSHARG-StandAloneServer.xml
index ad1b69e79e..ad1b69e79e 100644
--- a/docs/Samba-HOWTO-Collection/StandAloneServer.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-StandAloneServer.xml
diff --git a/docs/Samba-HOWTO-Collection/Unicode.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Unicode.xml
index a858a38508..a858a38508 100644
--- a/docs/Samba-HOWTO-Collection/Unicode.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Unicode.xml
diff --git a/docs/Samba-HOWTO-Collection/VFS.xml b/docs/Samba-HOWTO-Collection/TOSHARG-VFS.xml
index b4b87b5521..b4b87b5521 100644
--- a/docs/Samba-HOWTO-Collection/VFS.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-VFS.xml
diff --git a/docs/Samba-HOWTO-Collection/Winbind.xml b/docs/Samba-HOWTO-Collection/TOSHARG-Winbind.xml
index eabdcf9a72..eabdcf9a72 100644
--- a/docs/Samba-HOWTO-Collection/Winbind.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-Winbind.xml
diff --git a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/TOSHARG-WindowsClientConfig.xml
index be080638f6..be080638f6 100644
--- a/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-WindowsClientConfig.xml
diff --git a/docs/Samba-HOWTO-Collection/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/TOSHARG-foreword-tridge.xml
index 3237b291a1..34bc37314d 100644
--- a/docs/Samba-HOWTO-Collection/foreword-tridge.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-foreword-tridge.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE preface PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 <preface>
-	<title>Foreword</title>
+<title>Foreword</title>
 
-	<para>
+<para>
 Over the last few years, the Samba project has undergone a major
 transformation. From a small project used only by people who dream in
 machine code, Samba has grown to be an integral part of the IT
diff --git a/docs/Samba-HOWTO-Collection/glossary.xml b/docs/Samba-HOWTO-Collection/TOSHARG-glossary.xml
index 3a36e2c553..3a36e2c553 100644
--- a/docs/Samba-HOWTO-Collection/glossary.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-glossary.xml
diff --git a/docs/Samba-HOWTO-Collection/locking.xml b/docs/Samba-HOWTO-Collection/TOSHARG-locking.xml
index 2aa6b622a2..2aa6b622a2 100644
--- a/docs/Samba-HOWTO-Collection/locking.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-locking.xml
diff --git a/docs/Samba-HOWTO-Collection/msdfs.xml b/docs/Samba-HOWTO-Collection/TOSHARG-msdfs.xml
index 126edd0eb6..126edd0eb6 100644
--- a/docs/Samba-HOWTO-Collection/msdfs.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-msdfs.xml
diff --git a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/TOSHARG-upgrading-to-3.0.xml
index fa87a220ea..fa87a220ea 100644
--- a/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
+++ b/docs/Samba-HOWTO-Collection/TOSHARG-upgrading-to-3.0.xml
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index 6ec70c83b3..eb906dc29d 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -12,180 +12,149 @@
 	<editor>&person.jerry;</editor>
 	</authorgroup>
 	<pubdate><?latex \today ?></pubdate>
-
 </bookinfo>
 
-<?latex \setcounter{page}{5} ?>
-
-<xi:include href="../Samba-HOWTO-Collection-attributions.xml">
-	<xi:fallback/>
-</xi:include>
-
-<?latex \cleardoublepage ?>
-
-<preface>
-	<title>Abstract</title>
-
-<para>
-The editors wish to thank you for your decision to purchase this book.
-The Official Samba-3 HOWTO and Reference Guide is the result of many years
-of accumulation of information, feedback, tips, hints, and happy solutions.
-</para>
-
-<para>
-Please note that this book is a living document, the contents of which are
-constantly being updated. We encourage you to contribute your tips, techniques,
-helpful hints, and your special insight into the Windows networking world to
-help make the next generation of this book even more valuable to Samba users.
-</para>
-
-<para>
-We have made a concerted effort to document more comprehensively than has been
-done previously the information that may help you to better deploy Samba and to
-gain more contented network users.
-</para>
-
-<para>
-This book provides example configurations, it documents key aspects of Microsoft
-Windows networking, provides in-depth insight into the important configuration of
-Samba-3, and helps to put all of these into a useful framework.
-</para>
-
-<para>
-The most recent electronic versions of this document can be found at
-<ulink noescape="1" url="http://www.samba.org/">http://www.samba.org/</ulink>
-on the <quote>Documentation</quote> page.
-</para>
+	<?latex \setcounter{page}{5} ?>
 
-<para>
-Updates, patches and corrections are most welcome. Please email your contributions
-to any one of the following:
-</para>
+	<xi:include href="../Samba-HOWTO-Collection-attributions.xml">
+		<xi:fallback/>
+	</xi:include>
 
-<para>
-<simplelist>
-<member><ulink noescape="1" url="mailto:jelmer@samba.org">Jelmer Vernooij (jelmer@samba.org)</ulink></member>
-<member><ulink noescape="1" url="mailto:jht@samba.org">John H. Terpstra (jht@samba.org)</ulink></member>
-<member><ulink noescape="1" url="mailto:jerry@samba.org">Gerald (Jerry) Carter (jerry@samba.org)</ulink></member>
-</simplelist>
-</para>
+	<?latex \cleardoublepage ?>
 
-<para>
-We wish to advise that only original and unencumbered material can be published. Please do not submit
-content that is not your own work unless proof of consent from the copyright holder accompanies your
-submission.
-</para>
+	<xi:include href="TOSHARG-preface.xml"/>
 
-</preface>
+	<?latex \cleardoublepage ?>
 
-<?latex \cleardoublepage ?>
+	<xi:include href="TOSHARG-foreword-tridge.xml"/>
 
-<xi:include href="foreword-tridge.xml"/>
+	<?latex \cleardoublepage ?>
 
-<?latex \cleardoublepage ?>
 <!-- Contents -->
-<toc/>
-<?latex \cleardoublepage ?>
+	<toc/>
+
+	<?latex \cleardoublepage ?>
 
-<lot/>
+	<lot/>
 
-<xi:include href="IntroSMB.xml"/>
+	<xi:include href="TOSHARG-IntroSMB.xml"/>
 
 <!-- Chapters -->
 <part id="introduction">
 <title>General Installation</title>
 <?latex \pagenumbering{arabic} ?>
+
 <partintro>
 <title>Preparing Samba for Configuration</title>
-<para>This section of the Samba-HOWTO-Collection contains general info on how to install Samba 
+
+<para>
+This section of the Samba-HOWTO-Collection contains general info on how to install Samba 
 and how to configure the parts of Samba you will most likely need.
-PLEASE read this.</para>
+PLEASE read this.
+</para>
+
 </partintro>
-<xi:include href="Install.xml"/>
-<xi:include href="FastStart.xml"/>
+
+	<xi:include href="TOSHARG-Install.xml"/>
+	<xi:include href="TOSHARG-FastStart.xml"/>
+
 </part>
 
 <part id="type">
 <title>Server Configuration Basics</title>
 <partintro>
 <title>First Steps in Server Configuration</title>
+
 <para>
 Samba can operate in various modes within SMB networks. This HOWTO section contains information on
 configuring Samba to function as the type of server your network requires. Please read this
 section carefully.
 </para>
+
 </partintro>
-<xi:include href="ServerType.xml"/>
-<xi:include href="PDC.xml"/>
-<xi:include href="BDC.xml"/>
-<xi:include href="DomainMember.xml"/>
-<xi:include href="StandAloneServer.xml"/>
-<xi:include href="WindowsClientConfig.xml"/>
+
+	<xi:include href="TOSHARG-ServerType.xml"/>
+	<xi:include href="TOSHARG-PDC.xml"/>
+	<xi:include href="TOSHARG-BDC.xml"/>
+	<xi:include href="TOSHARG-DomainMember.xml"/>
+	<xi:include href="TOSHARG-StandAloneServer.xml"/>
+	<xi:include href="TOSHARG-WindowsClientConfig.xml"/>
+
 </part>
 
 <part id="optional">
 <title>Advanced Configuration</title>
 <partintro>
 <title>Valuable Nuts and Bolts Information</title>
+
 <para>
-Samba has several features that you might want or might not want to use. The chapters in this part each cover specific Samba features.
+Samba has several features that you might want or might not want to use.
+The chapters in this part each cover specific Samba features.
 </para>
+
 </partintro>
-<xi:include href="NetworkBrowsing.xml"/>
-<xi:include href="Passdb.xml"/>
-<xi:include href="Group-Mapping.xml"/>
-<xi:include href="IDMAP.xml"/>
-<xi:include href="RightsAndPriviliges.xml"/>
-<xi:include href="AccessControls.xml"/>
-<xi:include href="locking.xml"/>
-<xi:include href="Securing.xml"/>
-<xi:include href="InterdomainTrusts.xml"/>
-<xi:include href="msdfs.xml"/>
-<xi:include href="Printing.xml"/>
-<xi:include href="CUPS-printing.xml"/>
-<xi:include href="VFS.xml"/>
-<xi:include href="Winbind.xml"/>
-<xi:include href="AdvancedNetworkAdmin.xml"/>
-<xi:include href="PolicyMgmt.xml"/>
-<xi:include href="ProfileMgmt.xml"/>
-<xi:include href="PAM.xml"/>
-<xi:include href="Integrating-with-Windows.xml"/>
-<xi:include href="Unicode.xml"/>
-<xi:include href="Backup.xml"/>
-<xi:include href="HighAvailability.xml"/>
-<xi:include href="LargeFile.xml"/>
+
+	<xi:include href="TOSHARG-NetworkBrowsing.xml"/>
+	<xi:include href="TOSHARG-Passdb.xml"/>
+	<xi:include href="TOSHARG-Group-Mapping.xml"/>
+	<xi:include href="TOSHARG-IDMAP.xml"/>
+	<xi:include href="TOSHARG-RightsAndPriviliges.xml"/>
+	<xi:include href="TOSHARG-AccessControls.xml"/>
+	<xi:include href="TOSHARG-locking.xml"/>
+	<xi:include href="TOSHARG-Securing.xml"/>
+	<xi:include href="TOSHARG-InterdomainTrusts.xml"/>
+	<xi:include href="TOSHARG-msdfs.xml"/>
+	<xi:include href="TOSHARG-Printing.xml"/>
+	<xi:include href="TOSHARG-CUPS-printing.xml"/>
+	<xi:include href="TOSHARG-VFS.xml"/>
+	<xi:include href="TOSHARG-Winbind.xml"/>
+	<xi:include href="TOSHARG-AdvancedNetworkAdmin.xml"/>
+	<xi:include href="TOSHARG-PolicyMgmt.xml"/>
+	<xi:include href="TOSHARG-ProfileMgmt.xml"/>
+	<xi:include href="TOSHARG-PAM.xml"/>
+	<xi:include href="TOSHARG-Integrating-with-Windows.xml"/>
+	<xi:include href="TOSHARG-Unicode.xml"/>
+	<xi:include href="TOSHARG-Backup.xml"/>
+	<xi:include href="TOSHARG-HighAvailability.xml"/>
+	<xi:include href="TOSHARG-LargeFile.xml"/>
+
 </part>
 
 <part id="migration">
 <title>Migration and Updating</title>
-<xi:include href="upgrading-to-3.0.xml"/>
-<xi:include href="NT4Migration.xml"/>
-<xi:include href="SWAT.xml"/>
+
+	<xi:include href="TOSHARG-upgrading-to-3.0.xml"/>
+	<xi:include href="TOSHARG-NT4Migration.xml"/>
+	<xi:include href="TOSHARG-SWAT.xml"/>
+
 </part>
 
 <part id="troubleshooting">
 <title>Troubleshooting</title>
-<xi:include href="Diagnosis.xml"/>
-<xi:include href="Problems.xml"/>
-<xi:include href="Bugs.xml"/>
+
+	<xi:include href="TOSHARG-Diagnosis.xml"/>
+	<xi:include href="TOSHARG-Problems.xml"/>
+	<xi:include href="TOSHARG-Bugs.xml"/>
+
 </part>
 
 <part id="Appendix">
 <title>Appendixes</title>
-<xi:include href="Compiling.xml"/>
-<xi:include href="Portability.xml"/>
-<xi:include href="Other-Clients.xml"/>
-<xi:include href="Speed.xml"/>
-<xi:include href="DNS-DHCP-Configuration.xml"/>
-</part>
 
+	<xi:include href="TOSHARG-Compiling.xml"/>
+	<xi:include href="TOSHARG-Portability.xml"/>
+	<xi:include href="TOSHARG-Other-Clients.xml"/>
+	<xi:include href="TOSHARG-Speed.xml"/>
+	<xi:include href="TOSHARG-DNS-DHCP-Configuration.xml"/>
+
+</part>
 
+	<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
 
-<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
+	<xi:include href="TOSHARG-glossary.xml"/>
 
-<xi:include href="glossary.xml"/>
+	<?latex \chaptermark{Subject index} ?>
 
-<?latex \chaptermark{Subject index} ?>
-<index/>
+	<index/>
 
 </book>