More updates.

(This used to be commit 20f8bde1d0a2b2e42efedcdac21778fe34c0ab79)

1 files changed, 85 insertions, 116 deletions

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>