Fixing appendix nomenclature.

(This used to be commit b5564c3301f92e951dcf7d14e11e3edfca2e94df)

diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
index 374de55f9c3820a1c5f9cc56d9e1fff18cef1d7c..b7d62eb4cd8f9491ff9abb96b21d0f01fc1fac8b 100644 (file)
--- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
@@ -1611,7 +1611,7 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
                Join the Windows domain <constant>MEGANET</constant>. Use the domain administrator
                username <constant>root</constant> and the SMB password you assigned to this account.
                A detailed step-by-step procedure for joining a Windows 200x/XP Professional client to
-               a Windows domain is given in Appendix A, <link linkend="domjoin"/>. 
+               a Windows domain is given in <link linkend="appendix"/>, <link linkend="domjoin"/>. 
                Reboot the machine as prompted and then log on using the domain administrator account
                (<constant>root</constant>).
                </para></step>
@@ -1732,7 +1732,7 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
 
                <step><para>
                Log onto the machine as the local Administrator (the only option), and join the machine to
-               the domain following the procedure set out in Appendix A, <link linkend="domjoin"/>. You must now set the 
+               the domain following the procedure set out in <link linkend="appendix"/>, <link linkend="domjoin"/>. You must now set the 
                persistent drive mapping to the applications server that the user is to use. The system is now 
                ready for the user to log on, provided you have created a network logon account for that 
                user, of course.

diff --git a/docs/Samba3-ByExample/SBE-Appendix1.xml b/docs/Samba3-ByExample/SBE-Appendix1.xml
index fe321f89295a293525a4c6271cba39b3810577ba..ebc25385668d0890f9b149d277ec7aabc027698e 100644 (file)
--- a/docs/Samba3-ByExample/SBE-Appendix1.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE appendix PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
 
-<appendix id="appendix">
+<chapter id="appendix">
   <title>A Collection of Useful Tidbits</title>
 
        <para>
@@ -1613,5 +1613,5 @@ REGEDIT4
 
 </sect1>
 
-</appendix>
+</chapter>
 

diff --git a/docs/Samba3-ByExample/SBE-Appendix2.xml b/docs/Samba3-ByExample/SBE-Appendix2.xml
index 395c84391608be4f52ef78272f45d9a37cd4f385..da05d685cc3d19f923bb9ed8918a27de98a2f93a 100644 (file)
--- a/docs/Samba3-ByExample/SBE-Appendix2.xml
+++ b/docs/Samba3-ByExample/SBE-Appendix2.xml
@@ -1,6 +1,6 @@
 <?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">
-<appendix id="primer">
+<chapter id="primer">
   <title>Networking Primer</title>
 
        <para>
@@ -1279,5 +1279,5 @@
 
 </sect1>
 
-</appendix>
+</chapter>
 

diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
index 3771e23d18220bea0a672d56cc0f1dbf5f26f88d..d0fb21117e06473ee60e0dc93eded896aad85a98 100644 (file)
--- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
+++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml
@@ -3933,7 +3933,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
                <step><para>
                Join your Windows XP Professional workstation (the staging machine) to the 
                <constant>MEGANET2</constant> domain. If you are not sure of the procedure, 
-               follow the guidance given in Appendix A, <link linkend="domjoin"/>.
+               follow the guidance given in <link linkend="appendix"/>, <link linkend="domjoin"/>.
                </para></step>
 
                <step><para>

diff --git a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
index 8eeffdadf7b5c851b2bf2435df8bb91e0eb7af39..5334867aedaab0d399d1b38fc89ef27f6ec7df3b 100644 (file)
--- a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml
@@ -2241,7 +2241,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
                Join the Windows Domain <constant>PROMISES</constant>. Use the Domain Administrator
                username <constant>root</constant> and the SMB password you assigned to this account.
                A detailed step-by-step procedure for joining a Windows 200x/XP Professional client to
-               a Windows Domain is given in Appendix A, <link linkend="domjoin"/>. 
+               a Windows Domain is given in <link linkend="appendix"/>, <link linkend="domjoin"/>. 
                Reboot the machine as prompted and then log on using the Domain Administrator account
                (<constant>root</constant>).
                </para></step>
@@ -2300,7 +2300,7 @@ Nmap run completed -- 1 IP address (1 host up) scanned in 168 seconds
 
                <step><para>
                Log on to the machine as the local Administrator (the only option), and join the machine to
-               the Domain, following the procedure set out in Appendix A, <link linkend="domjoin"/>. The system is now 
+               the Domain, following the procedure set out in <link linkend="appendix"/>, <link linkend="domjoin"/>. The system is now 
                ready for the user to log on, provided you have created a network logon account for that 
                user, of course.
                </para></step>

diff --git a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
index d3acd9d1da5482fb6b04f03701c33d219440d268..d45a3f02a4ee2b312625405b1872c57e1b542ffb 100644 (file)
--- a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml
@@ -417,8 +417,8 @@
                allows all files to be owned by the same user and group. In addition, it would not hurt to
                set SUID and set SGID shared directories. This means that all new files that are created, no matter
                who creates it, are owned by the owner or group of the directory in which they are created.
-               For further information regarding the significance of the SUID/SGID settings, see Appendix A, 
-               <link linkend="ch12-SUIDSGID"/>.
+               For further information regarding the significance of the SUID/SGID settings, see <link
+               linkend="appendix"/>, <link linkend="ch12-SUIDSGID"/>.
                </para>
 
                <para>

diff --git a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
index 59c59637946a0ee3240979e068a46fb111791cde..15da3ae86dd9a03de8985ba7242ae0c0d3700b4f 100644 (file)
--- a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
+++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml
@@ -871,7 +871,7 @@ smb: \> q
                Join the Windows Domain called <constant>BILLMORE</constant>. Use the Domain Administrator
                username <constant>root</constant> and the SMB password you assigned to this account.
                A detailed step-by-step procedure for joining a Windows 200x/XP Professional client to
-               a Windows Domain is given in Appendix A, <link linkend="domjoin"/>. 
+               a Windows Domain is given in <link linkend="appendix"/>, <link linkend="domjoin"/>. 
                Reboot the machine as prompted and then log on using a Domain User account.
                </para></step>
 

diff --git a/docs/Samba3-ByExample/SBE-preface.xml b/docs/Samba3-ByExample/SBE-preface.xml
index d9d9cb9492645b57db196933ef8eb7006d6cd1a3..fe469b83849cb1ac62687f26ee6412cd129e3813 100644 (file)
--- a/docs/Samba3-ByExample/SBE-preface.xml
+++ b/docs/Samba3-ByExample/SBE-preface.xml
@@ -571,19 +571,19 @@
                </varlistentry>
 
                <varlistentry>
-               <term>Appendix A &smbmdash; A Collection of Useful Tid-bits.</term><listitem>
+               <term>Chapter 15 &smbmdash; A Collection of Useful Tid-bits.</term><listitem>
                <para>
                Sometimes it seems that there is not a good place for certain odds and ends that
                impact Samba deployment. Some readers would argue that everyone can be expected
                to know this information, or at least be able to find it easily. So to avoid
-               offending a reader's sensitivities, the tid-bits have been placed in this Appendix.
+               offending a reader's sensitivities, the tid-bits have been placed in this chapter.
                Do check out the contents, you may find something of value among the loose ends.
                </para>
                </listitem>
                </varlistentry>
 
                <varlistentry>
-               <term>Appendix B &smbmdash; Windows Networking Primer.</term><listitem>
+               <term>Chapter 16 &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

diff --git a/docs/Samba3-ByExample/index.xml b/docs/Samba3-ByExample/index.xml
index a31b78dafe5c24385d7abcec5d95430abeb0e794..07ec80d4c8ff489258db38ade908cbac7eb57e68 100644 (file)
--- a/docs/Samba3-ByExample/index.xml
+++ b/docs/Samba3-ByExample/index.xml
@@ -17,25 +17,17 @@
 \r
        <xi:include href="SBE-inside-cover.xml"/>\r
        <xi:include href="SBE-acknowledgements.xml"/>\r
-\r
        <?latex \cleardoublepage ?>\r
 \r
        <toc/>\r
-\r
        <?latex \cleardoublepage ?>\r
-\r
        <?latex \listofexamples ?>\r
-\r
        <?latex \cleardoublepage ?>\r
-\r
        <lot/>\r
-\r
        <?latex \cleardoublepage ?>\r
-\r
        <xi:include href="SBE-foreword.xml"/>\r
        <xi:include href="SBE-preface.xml"/>\r
-\r
-       <!-- Chapters -->\r
+<!-- Chapters -->\r
 \r
 <part id="ExNetworks">\r
 <title>Example Network Configurations</title>\r
@@ -76,13 +68,18 @@ the Samba web site.
 </partintro>\r
 \r
        <?latex \cleardoublepage ?>\r
-\r
        <xi:include href="SBE-SimpleOfficeServer.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-TheSmallOffice.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-SecureOfficeServer.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-500UserNetwork.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-MakingHappyUsers.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-2000UserNetwork.xml"/>\r
+       <?latex \cleardoublepage ?>\r
 \r
 </part>\r
 \r
@@ -105,10 +102,15 @@ to a Samba or a Windows networking domain may also benefit by referring to the b
 </para>\r
 \r
 </partintro>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-AddingUNIXClients.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-UpgradingSamba.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-MigrateNT4Samba3.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-MigrateNW4Samba3.xml"/>\r
+       <?latex \cleardoublepage ?>\r
 </part>\r
 \r
 <part id="RefSection">\r
@@ -124,14 +126,27 @@ play in a Windows networking world.
 </para>\r
 \r
 </partintro>\r
+\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-KerberosFastStart.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-DomainAppsSupport.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-HighAvailability.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-Support.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-Appendix1.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="SBE-Appendix2.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <xi:include href="http://www.gnu.org/licenses/gpl.xml"/>\r
+       <?latex \cleardoublepage ?>\r
+\r
 </part>\r
+\r
        <xi:include href="SBE-glossary.xml"/>\r
+       <?latex \cleardoublepage ?>\r
        <index/>\r
+\r
 </book>\r