Merge of HEAD document updates to 3.0.0

(This used to be commit 17a10b40fe18602c14542923da522fb14026dac5)

1 files changed, 7 insertions, 37 deletions

diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index 6ed6e1a717..d096cb8a5b 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -1,38 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-<!ENTITY UNIX-INSTALL SYSTEM "UNIX_INSTALL.sgml">
-<!ENTITY MS-Dfs-Setup SYSTEM "msdfs_setup.sgml">
-<!ENTITY PRINTER-DRIVER2 SYSTEM "printer_driver2.sgml">
-<!ENTITY DOMAIN-MEMBER SYSTEM "DOMAIN_MEMBER.sgml">
-<!ENTITY WINBIND SYSTEM "winbind.sgml">
-<!ENTITY NT-Security SYSTEM "NT_Security.sgml">
-<!ENTITY ServerType SYSTEM "ServerType.sgml">
-<!ENTITY Samba-PDC-HOWTO SYSTEM "Samba-PDC-HOWTO.sgml">
-<!ENTITY Samba-BDC-HOWTO SYSTEM "Samba-BDC-HOWTO.sgml">
-<!ENTITY IntegratingWithWindows SYSTEM "Integrating-with-Windows.sgml">
-<!ENTITY Samba-PAM SYSTEM "PAM-Authentication-And-Samba.sgml">
-<!ENTITY Diagnosis SYSTEM "Diagnosis.sgml">
-<!ENTITY BUGS SYSTEM "Bugs.sgml">
-<!ENTITY SECURITY-LEVEL SYSTEM "security_level.sgml">
-<!ENTITY SPEED SYSTEM "Speed.sgml">
-<!ENTITY BROWSING SYSTEM "Browsing.sgml">
-<!ENTITY BROWSING-Quick SYSTEM "Browsing-Quickguide.sgml">
-<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "GROUP-MAPPING-HOWTO.sgml">
-<!ENTITY Portability SYSTEM "Portability.sgml">
-<!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
-<!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml">
-<!ENTITY Passdb SYSTEM "passdb.sgml">
-<!ENTITY VFS SYSTEM "VFS.sgml">
-<!ENTITY SecuringSamba SYSTEM "securing-samba.sgml">
-<!ENTITY Compiling SYSTEM "Compiling.sgml">
-<!ENTITY unicode SYSTEM "unicode.sgml">
-<!ENTITY CUPS SYSTEM "CUPS-printing.sgml">
-<!ENTITY AdvancedNetworkAdmin SYSTEM "AdvancedNetworkAdmin.sgml">
-<!ENTITY PolicyMgmt SYSTEM "PolicyMgmt.sgml">
-<!ENTITY ProfileMgmt SYSTEM "ProfileMgmt.sgml">
-<!ENTITY NT4Migration SYSTEM "NT4Migration.sgml">
-<!ENTITY SWAT SYSTEM "SWAT.sgml">
-<!ENTITY Trusts SYSTEM "InterdomainTrusts.sgml">
 ]>
 
 <book id="Samba-HOWTO-Collection">
@@ -81,6 +48,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 and how to configure the parts of samba you will most likely need.
 PLEASE read this.</para>
 </partintro>
+&IntroSMB;
 &UNIX-INSTALL;
 &BROWSING-Quick;
 &Passdb;
@@ -129,12 +97,14 @@ for various environments.
 
 <part id="Appendixes">
 <title>Appendixes</title>
-&SWAT;
+&Compiling;
 &NT4Migration;
-&SPEED;
 &Portability;
 &Other-Clients;
-&Compiling;
-&BUGS;
+&SWAT;
+&SPEED;
 &Diagnosis;
+&problems;
+&BUGS;
 </part>
+</book>