From 83a17815a7689f1f6f7ca57161a0e804277c75f9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 20 Jun 2004 12:43:16 +0000
Subject: [PATCH] New structure for the docs:  - Same name for a doc everywhere
 (howto -> Samba-HOWTO-Collection, etc)  - Shorter and more clearly structured
 Makefile  - Make it possible to change the paths for the images (This used to
 be commit 96f6c05f25acc8a9bb1977b8bd5cc97ce511b6b1)

---
 docs/Makefile.in                              | 289 ++++++++----------
 .../CodingSuggestions.xml                     |   0
 .../NetBIOS.xml                               |   0
 .../Tracing.xml                               |   0
 .../architecture.xml                          |   0
 .../cifsntdomain.xml                          |   0
 .../contributing.xml                          |   0
 .../debug.xml                                 |   0
 .../encryption.xml                            |   0
 .../gencache.xml                              |   7 +-
 .../index.xml                                 |   7 +-
 .../internals.xml                             |   0
 .../modules.xml                               |   0
 .../packagers.xml                             |   0
 .../parsing.xml                               |   0
 .../printing.xml                              |   0
 .../registry.dot                              |   0
 .../registry.xml                              |   0
 .../rpc_plugin.xml                            |   0
 .../unix-smb.xml                              |   0
 .../{devel => Samba-Developers-Guide}/vfs.xml |   0
 .../windows-debug.xml                         |   0
 .../wins.xml                                  |   0
 .../Chap01-WindowsNetworkingPrimer.xml        | 106 ++-----
 .../Chap02-SimpleOfficeServer.xml             |  30 +-
 .../Chap03-TheSmallOffice.xml                 |  15 +-
 .../Chap04-SecureOfficeServer.xml             |  15 +-
 .../Chap05-500UserNetwork.xml                 |  15 +-
 .../Chap06-MakingHappyUsers.xml               |  49 +--
 .../Chap07-2000UserNetwork.xml                | 111 ++-----
 .../Chap08-MigrateNT4Samba3.xml               |  30 +-
 .../Chap09-AddingUNIXClients.xml              |  45 +--
 .../Chap10-KerberosFastStart.xml              |   0
 .../Chap10b-DomainAppsSupport.xml             |   0
 .../Chap11-HighAvailability.xml               |   0
 .../Chap12-Appendix.xml                       |  90 ++----
 .../acknowledgements.xml                      |   0
 docs/{guide => Samba-Guide}/conventions.xml   |   0
 docs/{guide => Samba-Guide}/foreword.xml      |   0
 docs/{guide => Samba-Guide}/front-matter.xml  |   0
 docs/{guide => Samba-Guide}/glossary.xml      |   0
 docs/{guide => Samba-Guide}/gpl.xml           |   0
 .../images/AccountingNetwork.dia              | Bin
 .../images/AccountingNetwork.png              | Bin
 .../images/Charity-Network.dia                | Bin
 .../images/Charity-Network.png                | Bin
 .../images/Domain-WorkgroupAnnouncement.png   | Bin
 .../images/HostAnnouncment.png                | Bin
 .../images/LocalMasterAnnouncement.png        | Bin
 .../images/NullConnect.png                    | Bin
 .../images/UNIX-Samba-and-LDAP.dia            | Bin
 .../images/UNIX-Samba-and-LDAP.png            | Bin
 .../images/UserConnect.png                    | Bin
 .../images/UserMgrNT4.png                     | Bin
 .../images/WINREPRESSME-Capture.png           | Bin
 .../images/WINREPRESSME-Capture2.png          | Bin
 ...INEPRESSME-Startup-30min-ProtocolStats.png | Bin
 ...E-WINEPRESSME-Startup-30min-TraceStats.png | Bin
 .../images/WindowsXP-NullConnection.png       | Bin
 .../images/WindowsXP-UserConnection.png       | Bin
 .../images/XP-screen001.png                   | Bin
 .../images/acct2net.dia                       | Bin
 .../images/acct2net.png                       | Bin
 .../images/ch7-dual-additive-LDAP-Ok.dia      | Bin
 .../images/ch7-dual-additive-LDAP-Ok.png      | Bin
 .../images/ch7-dual-additive-LDAP.dia         | Bin
 .../images/ch7-dual-additive-LDAP.png         | Bin
 .../images/ch7-fail-overLDAP.dia              | Bin
 .../images/ch7-fail-overLDAP.png              | Bin
 .../images/ch7-singleLDAP.dia                 | Bin
 .../images/ch7-singleLDAP.png                 | Bin
 .../images/ch8-migration.dia                  | Bin
 .../images/ch8-migration.png                  | Bin
 .../images/chap4-net.dia                      | Bin
 .../images/chap4-net.png                      | Bin
 .../images/chap5-net.dia                      | Bin
 .../images/chap5-net.png                      | Bin
 .../images/chap6-net.dia                      | Bin
 .../images/chap6-net.png                      | Bin
 .../images/chap7-idresol.dia                  | Bin
 .../images/chap7-idresol.png                  | Bin
 .../images/chap7-net-A.dia                    | Bin
 .../images/chap7-net-A.png                    | Bin
 .../images/chap7-net-Ar.png                   | Bin
 .../images/chap7-net.dia                      | Bin
 .../images/chap7-net.png                      | Bin
 .../images/chap7-net2-B.dia                   | Bin
 .../images/chap7-net2-B.png                   | Bin
 .../images/chap7-net2-Br.png                  | Bin
 .../images/chap7-net2.dia                     | Bin
 .../images/chap7-net2.png                     | Bin
 .../images/chap7-net2r.png                    | Bin
 .../images/chap7-netr.png                     | Bin
 .../images/chap9-ADSDC.dia                    | Bin
 .../images/chap9-ADSDC.png                    | Bin
 .../images/chap9-SambaDC.dia                  | Bin
 .../images/chap9-SambaDC.png                  | Bin
 .../images/lam-config.png                     | Bin
 .../images/lam-group-members.png              | Bin
 .../images/lam-groups.png                     | Bin
 .../images/lam-hosts.png                      | Bin
 .../images/lam-login.png                      | Bin
 .../images/lam-users.png                      | Bin
 .../{guide => Samba-Guide}/images/openmag.png | Bin
 .../{guide => Samba-Guide}/images/wxpp001.png | Bin
 .../{guide => Samba-Guide}/images/wxpp004.png | Bin
 .../{guide => Samba-Guide}/images/wxpp006.png | Bin
 .../{guide => Samba-Guide}/images/wxpp007.png | Bin
 .../{guide => Samba-Guide}/images/wxpp008.png | Bin
 .../{guide => Samba-Guide}/images/wxpp010.png | Bin
 .../{guide => Samba-Guide}/images/wxpp011.png | Bin
 .../{guide => Samba-Guide}/images/wxpp012.png | Bin
 .../{guide => Samba-Guide}/images/wxpp013.png | Bin
 .../{guide => Samba-Guide}/images/wxpp015.png | Bin
 docs/{guide => Samba-Guide}/index.xml         |   0
 docs/{guide => Samba-Guide}/inside-cover.xml  |   0
 docs/{guide => Samba-Guide}/preface.xml       |   0
 .../AccessControls.xml                        |   0
 .../AdvancedNetworkAdmin.xml                  |   0
 .../{howto => Samba-HOWTO-Collection}/BDC.xml |   0
 .../Backup.xml                                |   0
 .../Bugs.xml                                  |   0
 .../CUPS-printing.xml                         |   0
 .../Compiling.xml                             |   0
 .../DNS-DHCP-Configuration.xml                |   0
 .../Diagnosis.xml                             |   0
 .../DomainMember.xml                          |   0
 .../FastStart.xml                             |   0
 .../Further-Resources.xml                     |   7 +
 .../Group-Mapping.xml                         |   0
 .../HighAvailability.xml                      |   0
 .../Install.xml                               |   0
 .../Integrating-with-Windows.xml              |   0
 .../InterdomainTrusts.xml                     |   0
 .../IntroSMB.xml                              |   0
 .../NT4Migration.xml                          |   0
 .../NetworkBrowsing.xml                       |   0
 .../Other-Clients.xml                         |   0
 .../{howto => Samba-HOWTO-Collection}/PAM.xml |   0
 .../{howto => Samba-HOWTO-Collection}/PDC.xml |   0
 .../Passdb.xml                                |   0
 .../PolicyMgmt.xml                            |   0
 .../Portability.xml                           |   0
 .../Printing.xml                              |   0
 .../Problems.xml                              |   0
 .../ProfileMgmt.xml                           |   0
 .../SWAT.xml                                  |   0
 .../Securing.xml                              |   0
 .../ServerType.xml                            |   0
 .../Speed.xml                                 |   0
 .../StandAloneServer.xml                      |   0
 .../Unicode.xml                               |   0
 .../{howto => Samba-HOWTO-Collection}/VFS.xml |   0
 .../Winbind.xml                               |   0
 .../WindowsClientConfig.xml                   |   0
 .../foreword-tridge.xml                       |   0
 .../glossary.xml                              |   0
 .../imagefiles/.cvsignore                     |   0
 .../imagefiles/10small.png                    | Bin
 .../imagefiles/11small.png                    | Bin
 .../imagefiles/12small.png                    | Bin
 .../imagefiles/13small.png                    | Bin
 .../imagefiles/14small.png                    | Bin
 .../imagefiles/1small.png                     | Bin
 .../imagefiles/2small.png                     | Bin
 .../imagefiles/3small.png                     | Bin
 .../imagefiles/4small.png                     | Bin
 .../imagefiles/5small.png                     | Bin
 .../imagefiles/6small.png                     | Bin
 .../imagefiles/7small.png                     | Bin
 .../imagefiles/8small.png                     | Bin
 .../imagefiles/9small.png                     | Bin
 .../imagefiles/WME001.png                     | Bin
 .../imagefiles/WME002.png                     | Bin
 .../imagefiles/WME003.png                     | Bin
 .../imagefiles/WME004.png                     | Bin
 .../imagefiles/WME005.png                     | Bin
 .../imagefiles/WME006.png                     | Bin
 .../imagefiles/WME007.png                     | Bin
 .../imagefiles/WME008.png                     | Bin
 .../imagefiles/WME009.png                     | Bin
 .../imagefiles/WME010.png                     | Bin
 .../imagefiles/WME011.png                     | Bin
 .../imagefiles/WME012.png                     | Bin
 .../imagefiles/WME013.png                     | Bin
 .../imagefiles/WME014.png                     | Bin
 .../imagefiles/WXPP002.png                    | Bin
 .../imagefiles/WXPP003.png                    | Bin
 .../imagefiles/WXPP005.png                    | Bin
 .../imagefiles/WXPP009.png                    | Bin
 .../imagefiles/WXPP014.png                    | Bin
 .../imagefiles/a_small.png                    | Bin
 .../imagefiles/access1.dia                    | Bin
 .../imagefiles/access1.png                    | Bin
 .../imagefiles/browsing1                      | Bin
 .../imagefiles/browsing1.png                  | Bin
 .../imagefiles/cups1.dia                      | Bin
 .../imagefiles/cups1.png                      | Bin
 .../imagefiles/cups2.dia                      | Bin
 .../imagefiles/cups2.png                      | Bin
 .../imagefiles/domain.dia                     | Bin
 .../imagefiles/domain.png                     | Bin
 .../imagefiles/ethereal1.png                  | Bin
 .../imagefiles/ethereal2.png                  | Bin
 .../imagefiles/idmap-gid2sid.dia              | Bin
 .../imagefiles/idmap-gid2sid.png              | Bin
 .../imagefiles/idmap-groups.dia               | Bin
 .../imagefiles/idmap-groups.png               | Bin
 .../imagefiles/idmap-sid2gid.dia              | Bin
 .../imagefiles/idmap-sid2gid.png              | Bin
 .../imagefiles/idmap-sid2uid.dia              | Bin
 .../imagefiles/idmap-sid2uid.png              | Bin
 .../imagefiles/idmap-store-gid2sid.dia        | Bin
 .../imagefiles/idmap-store-gid2sid.png        | Bin
 .../imagefiles/idmap-uid2sid.dia              | Bin
 .../imagefiles/idmap-uid2sid.png              | Bin
 .../imagefiles/idmap.dia                      | Bin
 .../imagefiles/idmap.png                      | Bin
 .../imagefiles/idmap_winbind_no_loop.png      | Bin
 .../imagefiles/pdftoepsonusb.dia              | Bin
 .../imagefiles/pdftoepsonusb.png              | Bin
 .../imagefiles/pdftosocket.dia                | Bin
 .../imagefiles/pdftosocket.png                | Bin
 .../imagefiles/trusts1.dia                    | Bin
 .../imagefiles/trusts1.png                    | Bin
 .../imagefiles/w2kp001.png                    | Bin
 .../imagefiles/w2kp002.png                    | Bin
 .../imagefiles/w2kp003.png                    | Bin
 .../imagefiles/w2kp004.png                    | Bin
 .../imagefiles/w2kp005.png                    | Bin
 .../imagefiles/w2kp006.png                    | Bin
 .../imagefiles/wxpp001.png                    | Bin
 .../imagefiles/wxpp004.png                    | Bin
 .../imagefiles/wxpp006.png                    | Bin
 .../imagefiles/wxpp007.png                    | Bin
 .../imagefiles/wxpp008.png                    | Bin
 .../imagefiles/wxpp010.png                    | Bin
 .../imagefiles/wxpp011.png                    | Bin
 .../imagefiles/wxpp012.png                    | Bin
 .../imagefiles/wxpp013.png                    | Bin
 .../imagefiles/wxpp015.png                    | Bin
 .../index.xml                                 |   7 +-
 .../locking.xml                               |   0
 .../msdfs.xml                                 |   0
 .../upgrading-to-3.0.xml                      |   0
 docs/htmldocs.html                            |   6 +-
 docs/xslt/expand-sambadoc.xsl                 |   2 +-
 docs/xslt/generate-attributions.xsl           |   9 +
 docs/xslt/latex.xsl                           |   2 +-
 249 files changed, 282 insertions(+), 560 deletions(-)
 rename docs/{devel => Samba-Developers-Guide}/CodingSuggestions.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/NetBIOS.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/Tracing.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/architecture.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/cifsntdomain.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/contributing.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/debug.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/encryption.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/gencache.xml (96%)
 rename docs/{devel => Samba-Developers-Guide}/index.xml (96%)
 rename docs/{devel => Samba-Developers-Guide}/internals.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/modules.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/packagers.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/parsing.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/printing.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/registry.dot (100%)
 rename docs/{devel => Samba-Developers-Guide}/registry.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/rpc_plugin.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/unix-smb.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/vfs.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/windows-debug.xml (100%)
 rename docs/{devel => Samba-Developers-Guide}/wins.xml (100%)
 rename docs/{guide => Samba-Guide}/Chap01-WindowsNetworkingPrimer.xml (93%)
 rename docs/{guide => Samba-Guide}/Chap02-SimpleOfficeServer.xml (98%)
 rename docs/{guide => Samba-Guide}/Chap03-TheSmallOffice.xml (99%)
 rename docs/{guide => Samba-Guide}/Chap04-SecureOfficeServer.xml (99%)
 rename docs/{guide => Samba-Guide}/Chap05-500UserNetwork.xml (99%)
 rename docs/{guide => Samba-Guide}/Chap06-MakingHappyUsers.xml (99%)
 rename docs/{guide => Samba-Guide}/Chap07-2000UserNetwork.xml (96%)
 rename docs/{guide => Samba-Guide}/Chap08-MigrateNT4Samba3.xml (98%)
 rename docs/{guide => Samba-Guide}/Chap09-AddingUNIXClients.xml (98%)
 rename docs/{guide => Samba-Guide}/Chap10-KerberosFastStart.xml (100%)
 rename docs/{guide => Samba-Guide}/Chap10b-DomainAppsSupport.xml (100%)
 rename docs/{guide => Samba-Guide}/Chap11-HighAvailability.xml (100%)
 rename docs/{guide => Samba-Guide}/Chap12-Appendix.xml (96%)
 rename docs/{guide => Samba-Guide}/acknowledgements.xml (100%)
 rename docs/{guide => Samba-Guide}/conventions.xml (100%)
 rename docs/{guide => Samba-Guide}/foreword.xml (100%)
 rename docs/{guide => Samba-Guide}/front-matter.xml (100%)
 rename docs/{guide => Samba-Guide}/glossary.xml (100%)
 rename docs/{guide => Samba-Guide}/gpl.xml (100%)
 rename docs/{guide => Samba-Guide}/images/AccountingNetwork.dia (100%)
 rename docs/{guide => Samba-Guide}/images/AccountingNetwork.png (100%)
 rename docs/{guide => Samba-Guide}/images/Charity-Network.dia (100%)
 rename docs/{guide => Samba-Guide}/images/Charity-Network.png (100%)
 rename docs/{guide => Samba-Guide}/images/Domain-WorkgroupAnnouncement.png (100%)
 rename docs/{guide => Samba-Guide}/images/HostAnnouncment.png (100%)
 rename docs/{guide => Samba-Guide}/images/LocalMasterAnnouncement.png (100%)
 rename docs/{guide => Samba-Guide}/images/NullConnect.png (100%)
 rename docs/{guide => Samba-Guide}/images/UNIX-Samba-and-LDAP.dia (100%)
 rename docs/{guide => Samba-Guide}/images/UNIX-Samba-and-LDAP.png (100%)
 rename docs/{guide => Samba-Guide}/images/UserConnect.png (100%)
 rename docs/{guide => Samba-Guide}/images/UserMgrNT4.png (100%)
 rename docs/{guide => Samba-Guide}/images/WINREPRESSME-Capture.png (100%)
 rename docs/{guide => Samba-Guide}/images/WINREPRESSME-Capture2.png (100%)
 rename docs/{guide => Samba-Guide}/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png (100%)
 rename docs/{guide => Samba-Guide}/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png (100%)
 rename docs/{guide => Samba-Guide}/images/WindowsXP-NullConnection.png (100%)
 rename docs/{guide => Samba-Guide}/images/WindowsXP-UserConnection.png (100%)
 rename docs/{guide => Samba-Guide}/images/XP-screen001.png (100%)
 rename docs/{guide => Samba-Guide}/images/acct2net.dia (100%)
 rename docs/{guide => Samba-Guide}/images/acct2net.png (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-dual-additive-LDAP-Ok.dia (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-dual-additive-LDAP-Ok.png (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-dual-additive-LDAP.dia (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-dual-additive-LDAP.png (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-fail-overLDAP.dia (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-fail-overLDAP.png (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-singleLDAP.dia (100%)
 rename docs/{guide => Samba-Guide}/images/ch7-singleLDAP.png (100%)
 rename docs/{guide => Samba-Guide}/images/ch8-migration.dia (100%)
 rename docs/{guide => Samba-Guide}/images/ch8-migration.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap4-net.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap4-net.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap5-net.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap5-net.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap6-net.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap6-net.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-idresol.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-idresol.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net-A.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net-A.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net-Ar.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2-B.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2-B.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2-Br.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-net2r.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap7-netr.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap9-ADSDC.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap9-ADSDC.png (100%)
 rename docs/{guide => Samba-Guide}/images/chap9-SambaDC.dia (100%)
 rename docs/{guide => Samba-Guide}/images/chap9-SambaDC.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-config.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-group-members.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-groups.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-hosts.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-login.png (100%)
 rename docs/{guide => Samba-Guide}/images/lam-users.png (100%)
 rename docs/{guide => Samba-Guide}/images/openmag.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp001.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp004.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp006.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp007.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp008.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp010.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp011.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp012.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp013.png (100%)
 rename docs/{guide => Samba-Guide}/images/wxpp015.png (100%)
 rename docs/{guide => Samba-Guide}/index.xml (100%)
 rename docs/{guide => Samba-Guide}/inside-cover.xml (100%)
 rename docs/{guide => Samba-Guide}/preface.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/AccessControls.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/AdvancedNetworkAdmin.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/BDC.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Backup.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Bugs.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/CUPS-printing.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Compiling.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/DNS-DHCP-Configuration.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Diagnosis.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/DomainMember.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/FastStart.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Further-Resources.xml (94%)
 rename docs/{howto => Samba-HOWTO-Collection}/Group-Mapping.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/HighAvailability.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Install.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Integrating-with-Windows.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/InterdomainTrusts.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/IntroSMB.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/NT4Migration.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/NetworkBrowsing.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Other-Clients.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/PAM.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/PDC.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Passdb.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/PolicyMgmt.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Portability.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Printing.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Problems.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/ProfileMgmt.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/SWAT.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Securing.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/ServerType.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Speed.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/StandAloneServer.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Unicode.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/VFS.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/Winbind.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/WindowsClientConfig.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/foreword-tridge.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/glossary.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/.cvsignore (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/10small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/11small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/12small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/13small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/14small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/1small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/2small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/3small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/4small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/5small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/6small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/7small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/8small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/9small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME001.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME002.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME003.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME004.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME005.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME006.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME007.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME008.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME009.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME010.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME011.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME012.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME013.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WME014.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WXPP002.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WXPP003.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WXPP005.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WXPP009.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/WXPP014.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/a_small.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/access1.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/access1.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/browsing1 (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/browsing1.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/cups1.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/cups1.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/cups2.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/cups2.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/domain.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/domain.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/ethereal1.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/ethereal2.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-gid2sid.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-gid2sid.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-groups.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-groups.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-sid2gid.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-sid2gid.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-sid2uid.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-sid2uid.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-store-gid2sid.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-store-gid2sid.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-uid2sid.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap-uid2sid.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/idmap_winbind_no_loop.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/pdftoepsonusb.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/pdftoepsonusb.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/pdftosocket.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/pdftosocket.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/trusts1.dia (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/trusts1.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp001.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp002.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp003.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp004.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp005.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/w2kp006.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp001.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp004.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp006.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp007.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp008.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp010.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp011.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp012.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp013.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/imagefiles/wxpp015.png (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/index.xml (98%)
 rename docs/{howto => Samba-HOWTO-Collection}/locking.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/msdfs.xml (100%)
 rename docs/{howto => Samba-HOWTO-Collection}/upgrading-to-3.0.xml (100%)

diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7bd60d7886e..f675dd61ea0 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -4,12 +4,6 @@
 # 		James Moore <jmoore@php.net>
 # 		Gerald Carter <jerry@samba.org>
 # 		Jelmer Vernooij <jelmer@samba.org>
-#
-# Please see http://www.samba.org/samba/cvs.html
-# for information on getting the latest  
-# source and documentation source files.  
-#
-#
 
 # Programs
 WGET = @WGET@
@@ -38,14 +32,10 @@ SRCDIR = @SAMBASOURCEDIR@
 MANDIR = $(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
 MANPAGEDIR = manpages
-HOWTODIR = howto
-GUIDEDOC = guide
-DEVDOCDIR = devel
 MAKEINDEX = @MAKEINDEX@
-IMAGEPROJDIR = $(HOWTODIR)/imagefiles
-IMAGEGUIDEDIR = $(GUIDEDOC)/images
 EXAMPLESDIR = examples
 SMBDOTCONFDOC = smbdotconf
+DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
@@ -57,127 +47,121 @@ TXTDIR = $(OUTPUTDIR)/textdocs
 HTMLDIR=$(OUTPUTDIR)/htmldocs
 PLUCKERDIR=$(OUTPUTDIR)/plucker
 
+# Docs to build
+MAIN_DOCS = $(patsubst %/index.xml,$(DOCBOOKDIR)/%.xml,$(wildcard */index.xml))
+MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
+
 # Lists of files to process
 LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
-MANPAGES_SOURCES = $(wildcard $(MANPAGEDIR)/*.?.xml)
-MANPAGES = $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES_SOURCES)) $(MANDIR)/smb.conf.5
-MANPAGES_HTML = $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES_SOURCES)) $(HTMLDIR)/smb.conf.5.html $(HTMLDIR)/manpages.html
-MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES)) $(PLUCKERDIR)/smb.conf.5.pdb
+MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES))
 
-HOWTODIR_IMAGES_PNG = $(wildcard $(IMAGEPROJDIR)/*.png)
-GUIDEDOC_IMAGES_PNG = $(wildcard $(IMAGEGUIDEDIR)/*.png)
-HOWTODIR_IMAGES_EPS=$(patsubst %.png,%.eps,$(wildcard $(IMAGEPROJDIR)/*.png))
-HOWTODIR_DEPS = $(HOWTODIR)/*.xml $(HOWTODIR)/attributions.xml $(MANPAGEDIR)/*.xml smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml 
-DEVDOCDIR_DEPS = $(DEVDOCDIR)/*.xml $(DEVDOCDIR)/attributions.xml
+Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
+Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png)
+
+Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles
+Samba_Guide_IMAGEDIR = Samba-Guide/images
+
+Samba_HOWTO_Collection_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_HOWTO_Collection_IMAGES_PNG))
+Samba_Guide_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_Guide_IMAGES_PNG))
 
 help: 
 	@echo "Supported make targets:"
-	@echo "release - Build the docs needed for a Samba release"
-	@echo "pdf - Build PDF version of book"
-	@echo "tex - Build Latex version of book"
-	@echo "dvi - Build Device Independant File of book"
-	@echo "ps - Build PostScript version of book"
-	@echo "manpages - Build manpages"
-	@echo "txt - Build plain text version of HOWTO Collection and Developers Guide"
-	@echo -n "html-single - Build single file HTML version of HOWTO Collection"
-	@echo " and developers guide"
-	@echo "html - Build HTML version of HOWTO Collection and Developers Guide"
-	@echo "htmlman - Build html version of manpages"
-	@echo "plucker - Build HOWTO, Developers Guide, man pages in Plucker format for PDA"
-	@echo "undocumented - Output list of undocumented smb.conf options"
-	@echo "samples - Extract examples"
-	@echo "files - Extract other files"
-	@echo "all - Build all docs that can be build using the utilities found by configure"
-	@echo "everything - Build all of the above"
+	@echo " release - Build the docs needed for a Samba release"
+	@echo " all - Build all docs that can be build using the utilities found by configure"
+	@echo " everything - Build all of the above"
+	@echo " pdf,tex,dvi,ps,manpages,txt,pearson,fo,htmlhelp - Build specific output format"
+	@echo " html - Build multi-file HTML version of HOWTO Collection, Guide and Dev-Guide"
+	@echo " html-single - Build single-file HTML version of HOWTO Collection, Guide and Dev-Guide"
+	@echo " htmlman - Build HTML version of manpages"
+	@echo " undocumented - Output list of undocumented smb.conf options"
+	@echo " samples - Extract examples"
+	@echo " files - Extract other files"
 
+Samba-Guide/index.xml: $(subst Samba-Guide/index.xml,,$(wildcard Samba-Guide/*.xml))
+Samba-HOWTO-Collection/index.xml: $(subst Samba-HOWTO-Collection/index.xml,,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
+Samba-Developers-Guide/index.xml: $(subst Samba-Developers-Guide/index.xml,,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
+
+# Pseudo targets 
 all: @TARGETS@
-
-everything: manpages pdf html-single html htmlman txt ps
-
+everything: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson verify
 release: manpages htmlman html pdf guide
 
-# Global rules
+# Output format targets
+pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi: $(patsubst $(DOCBOOKDIR)/%.xml,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps: $(patsubst $(DOCBOOKDIR)/%.xml,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+fo: $(patsubst $(DOCBOOKDIR)/%.xml,$(FODIR)/%.fo,$(MAIN_DOCS))
+tex: $(patsubst $(DOCBOOKDIR)/%.xml,%.tex,$(MAIN_DOCS))
+manpages: $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES)) 
+pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
+pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
+plucker: $(patsubst $(DOCBOOKDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR)/manpages.html
+html-single: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
 
-pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf $(PDFDIR)/Samba-Developers-Guide.pdf
+# Intermediate docbook docs
 
-dvi: $(DVIDIR) $(DVIDIR)/Samba-HOWTO-Collection.dvi $(DVIDIR)/Samba-Developers-Guide.dvi
+$(DOCBOOKDIR):
+	mkdir $@
 
-ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps $(PSDIR)/Samba-Developers-Guide.ps
+$(DOCBOOKDIR)/%.xml: %/index.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
+$(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
-fo: $(FODIR) $(FODIR)/Samba-HOWTO-Collection.fo $(FODIR)/Samba-Developers-Guide.fo
-
-htmlman: $(HTMLDIR) $(MANPAGES_HTML) $(HTMLDIR)/samba.css
-
-html-single: $(HTMLDIR) $(HTMLDIR)/samba.css $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html $(HTMLDIR)/Samba-Guide.html
-	cp -p $(GUIDEDOC_IMAGES_PNG) $(HOWTODIR_IMAGES_PNG) $(HTMLDIR)/images/
-
-html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel $(HTMLDIR)/index.html
-
-htmlhelp: $(HTMLHELPDIR)/Samba-HOWTO-Collection $(HTMLHELPDIR)/Samba-Developers-Guide $(HTMLHELPDIR)/Samba-Guide
-
-$(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)
-	cp $< $@
-	
-$(HTMLDIR)/howto: $(HTMLDIR) $(HTMLDIR)/howto/samba.css Samba-HOWTO-Collection.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/howto/" xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
-	-mkdir $(HTMLDIR)/howto/images
-	cp -R $(HOWTODIR_IMAGES_PNG) $(HTMLDIR)/howto/images
-
-$(HTMLDIR)/devel: $(HTMLDIR) $(HTMLDIR)/devel/samba.css Samba-Developers-Guide.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/devel/" xslt/html-chunk.xsl Samba-Developers-Guide.xml
-
-$(HTMLDIR)/guide: $(HTMLDIR) $(HTMLDIR)/guide/samba.css Samba-Guide.xml
-	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/guide/" xslt/html-chunk.xsl Samba-Guide.xml
-	-mkdir $(HTMLDIR)/guide/images
-	cp -R $(GUIDEDOC_IMAGES_PNG) $(HTMLDIR)/guide/images
-
-manpages: $(MANDIR) $(MANPAGES)
-
-manpages.xml: $(MANPAGES_SOURCES)
+manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl
 	echo "<article><variablelist>" > $@
 	for I in $(MANPAGES_SOURCES); do $(XSLTPROC) xslt/manpage-summary.xsl $$I >> $@; done
 	echo "</variablelist></article>" >> $@
 
-tex: Samba-HOWTO-Collection.tex Samba-Developers-Guide.tex gpl.tex
+# HTML docs
 
-plucker: html-single htmlman $(PLUCKERDIR) $(MANPAGES_PLUCKER) $(PLUCKERDIR)/Samba-Developers-Guide.pdb $(PLUCKERDIR)/Samba-HOWTO-Collection.pdb
+$(HTMLDIR)/index.html: htmldocs.html $(HTMLDIR)
+	cp $< $@
+	
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/% $(HTMLDIR)/%/samba.css  xslt/html-chunk.xsl
+	$(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
+	-mkdir $(HTMLDIR)/$*/images
 
-Samba-HOWTO-Collection.xml: $(HOWTODIR)/index.xml $(HOWTODIR_DEPS)
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+# Single large HTML files
+$(HTMLDIR):
+	mkdir $(HTMLDIR)
+	mkdir $(HTMLDIR)/images
 
-Samba-Guide.xml: $(GUIDEDOC)/guide-main.xml
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
+	cp $< $@
 
-Samba-Developers-Guide.xml: $(DEVDOCDIR)/index.xml $(DEVDOCDIR_DEPS)
-	$(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR) $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl
+	echo $^
+	$(XSLTPROC) --output $@ xslt/html.xsl $<
 
-%/attributions.xml: %/index.xml
-	@echo "<empty/>" > $@ # Make sure we don't get recursive dependencies, etc!
-	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+$(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%,$(MAIN_DOCS)): $(HTMLDIR)
+	-mkdir $@
+
+%-attributions.xml: 
+	echo "<para/>" > $@
+	$(XSLTPROC) --xinclude xslt/generate-attributions.xsl $*/index.xml > $@
 
 clean: 
-	rm -rf $(OUTPUTDIR)/*
-	rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps \
-	    $(PDFDIR)/*.pdf $(HTMLDIR)/*html $(HTMLDIR)/samba.css
+	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
+	rm -f *.xml
 	rm -f xslt/figures/*pdf
-	rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi
-	rm -f samba-doc.* index.* $(HOWTODIR)/changelog.xml $(HOWTODIR)/attributions.xml $(DEVDOCDIR)/attributions.xml
-	rm -f Samba-HOWTO-Collection.*
-	rm -f Samba-Developers-Guide.*
-	rm -f Samba-Guide.*
-	rm -f $(IMAGEPROJDIR)/*.eps
+	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
+	rm -f $(patsubst $(DOCBOOKDIR)/%.xml,%.*,$(MAIN_DOCS))
 
 # Text files
 $(TXTDIR):
 	mkdir $(TXTDIR)
 
-$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
+$(TXTDIR)/%.txt: $(HTMLDIR)/%.html $(TXTDIR)
 	$(HTML2TEXT) -nobs -style pretty -o $@ $<
 
 # Tex files
-%.tex: %.xml
+%.tex: $(DOCBOOKDIR)/%.xml xslt/latex.xsl
 	$(XSLTPROC) --output $@ xslt/latex.xsl $<
 
 gpl.tex:
@@ -189,29 +173,27 @@ latexfigures: $(LATEX_FIGURES)
 	-$(PDFLATEX) $<
 	
 %.idx: %.aux
-	$(MAKEINDEX) `echo $< | sed -e 's/.aux//'`
+	$(MAKEINDEX) $*
 
 # Adobe PDF files
-$(PDFDIR)/%.pdf: %.tex %.aux %.idx latexfigures gpl.tex
+$(PDFDIR)/%.pdf: %.tex %.aux %.idx latexfigures gpl.tex $(PDFDIR) $(%_IMAGES_PNG)
 	-$(PDFLATEX) $<
 	-$(PDFLATEX) $<
-	$(THUMBPDF) $(patsubst %.tex,%.pdf,$<)
+	$(THUMBPDF) $*.pdf
 	-$(PDFLATEX) $<
-	mv $(patsubst %.tex,%.pdf,$<) $@
-
-epsimages: $(HOWTODIR_IMAGES_EPS)
+	mv $*.pdf $@
 
 # DVI files
-$(DVIDIR)/%.dvi: %.tex %.aux %.idx epsimages gpl.tex
+$(DVIDIR)/%.dvi: %.tex %.aux %.idx gpl.tex $(DVIDIR) $(%_IMAGES_EPS)
 	-$(LATEX) $< 
 	-$(LATEX) $< 
-	mv $(patsubst %.tex,%.dvi,$<) $@
+	mv $*.dvi $@
 
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
 # PostScript files
-$(PSDIR)/%.ps: $(DVIDIR)/%.dvi
+$(PSDIR)/%.ps: $(DVIDIR)/%.dvi $(PSDIR)
 	$(DVIPS) -o $@ $<
 
 xslt/figures/%.pdf: xslt/figures/%.eps
@@ -221,103 +203,74 @@ xslt/figures/%.pdf: xslt/figures/%.eps
 $(FODIR):
 	mkdir $(FODIR)
 
-$(FODIR)/%.fo: %.xml $(FODIR)
+$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml $(FODIR)
 	$(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
 # HTML Help
-
 $(HTMLHELPDIR):
 	mkdir $(HTMLHELPDIR)
 
-$(HTMLHELPDIR)/Samba-HOWTO-Collection/images: 
-	-mkdir -p $@
-	cp -p $(HOWTODIR_IMAGES_PNG) $@
+$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png
+	cp $< $@
 
-$(HTMLHELPDIR)/Samba-Guide/images:
-	-mkdir -p $@
-	cp -p $(GUIDEDOC_IMAGES_PNG) $@
+$(HTMLHELPDIR)/%/images: $(HTMLHELPDIR)/%
+	mkdir -p $@
 
-$(HTMLHELPDIR)/Samba-Developers-Guide/images:
+$(HTMLHELPDIR)/%/images/: $@ $(subst $($*_IMAGEDIR),$@/,$($*_IMAGES_PNG))
 
-$(HTMLHELPDIR)/%: %.xml $(HTMLHELPDIR) $(HTMLHELPDIR)/%/images
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml $(HTMLHELPDIR) $(HTMLHELPDIR)/%/images/
 	-mkdir $@
-	$(XSLTPROC) --stringparam htmlhelp.chm $(patsubst %.xml,%.chm,$<) --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
-
-# Single large HTML files
-
-$(HTMLDIR):
-	mkdir $(HTMLDIR)
-	mkdir $(HTMLDIR)/howto
-	mkdir $(HTMLDIR)/guide
-	mkdir $(HTMLDIR)/devel
-	mkdir $(HTMLDIR)/images
+	$(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 
+# Plucker docs
 $(PLUCKERDIR):
 	mkdir $(PLUCKERDIR)
 
-%/samba.css: xslt/html/samba.css
-	if [ ! -d `dirname $@` ]; then mkdir -p `dirname $@`; fi
-	cp $< $@
-
-$(HTMLDIR)/Samba-HOWTO-Collection.html: Samba-HOWTO-Collection.xml $(HOWTODIR_DEPS) $(HOWTODIR_IMAGES_PNG)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/Samba-Guide.html: Samba-Guide.xml $(GUIDEDOC_IMAGES_PNG)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/Samba-Developers-Guide.html: Samba-Developers-Guide.xml $(DEVDOCDIR_DEPS)
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(HTMLDIR)/%.html: %.xml
-	$(XSLTPROC) --output $@ xslt/html.xsl $<
-
-$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html
-	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $(patsubst $(PLUCKERDIR)/%.pdb,%,$@) -p $(PLUCKERDIR)
-
-%.xml: $(MANPAGEDIR)/%.xml
-	$(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
+$(PLUCKERDIR)/%.pdb: $(HTMLDIR)/%.html $(PLUCKERDIR)
+	$(PLUCKERBUILD) -v -M1 --stayonhost  --noimages --zlib-compression -H file:$< -f $* -p $(PLUCKERDIR)
 
 # Manpages
 $(MANPAGEDIR)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
 
-$(SMBDOTCONF)/parameters.all.xml:
-	@cd $(SMBDOTCONFDOC) && /bin/sh generate-file-list.sh >parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.all.xml: $(shell find $(SMBDOTCONFDOC) -type f -name '*.xml' -mindepth 2 | sort -t/ -k3 | xargs) $(SMBDOTCONFDOC)/generate-file-list.sh
+	$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
 
-$(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	$(XSLTPROC) --xinclude --param smb.context "'G'" --output $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
 
-$(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml
+$(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	$(XSLTPROC) --xinclude --param smb.context "'S'" --output $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
 
 $(MANDIR): 
 	mkdir $(MANDIR)
 
-$(MANDIR)/%: %.xml
+$(MANDIR)/%: $(DOCBOOKDIR)/%.xml xslt/man.xsl
 	$(XSLTPROC) --output $@ xslt/man.xsl $<
 
+# Pearson compatible XML
+
 $(PEARSONDIR):
 	mkdir $@
 
-$(PEARSONDIR)/%.xml: %.xml $(PEARSONDIR)
+$(PEARSONDIR)/%.xml: $(DOCBOOKDIR)/%.xml $(PEARSONDIR) xslt/pearson.xsl
 	$(XSLTPROC) --xinclude --output $@ xslt/pearson.xsl $<
 
 $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
 	$(XMLLINT) --valid --noout --htmlout $< 2> $@
 
-pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
-pearson-verify: $(PEARSONDIR)/Samba-HOWTO-Collection.report.html
+# Validation verification
 
 $(VALIDATEDIR):
 	mkdir $@
 
-$(VALIDATEDIR)/%.report.html: %.xml
+$(VALIDATEDIR)/%.report.html: $(DOCBOOKDIR)/%.xml
 	$(XMLLINT) --valid --noout --htmlout $< 2> $@
 
 verify: $(VALIDATEDIR) $(VALIDATEDIR)/Samba-HOWTO-Collection.report.html $(VALIDATEDIR)/Samba-Developers-Guide.report.html $(VALIDATEDIR)/Samba-Guide.report.html 
 
 # Find undocumented parameters
 
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
+undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
 	@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
 	@$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
 
@@ -326,19 +279,14 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml
 $(EXAMPLESDIR):
 	mkdir $(EXAMPLESDIR)
 
-files: $(HOWTODIR)/index.xml $(HOWTODIR)/attributions.xml $(EXAMPLESDIR)
+files: $(HOWTODIR)/index.xml $(EXAMPLESDIR) xslt/extract-smbfiles.xsl
 	$(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
 
-samples: $(EXAMPLESDIR) Samba-HOWTO-Collection.xml
-	$(XSLTPROC) xslt/extract-examples.xsl Samba-HOWTO-Collection.xml > /dev/null 2> examples/README
+samples: $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml $(EXAMPLESDIR) xslt/extract-examples.xsl scripts/indent-smb.conf.pl
+	$(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README
 	for I in examples/*.conf; do { ./scripts/indent-smb.conf.pl < $$I > $$I.tmp; mv $$I.tmp $$I; } done
 
-howto: $(PDFDIR)/Samba-HOWTO-Collection.pdf
-guide: $(PDFDIR)/Samba-Guide.pdf
-
-%/changelog.xml: % $(wildcard %/CVS/*)
-	touch $@
-	# FIXME
+# Archiving
 
 $(ARCHIVEDIR):
 	mkdir $(ARCHIVEDIR)
@@ -346,3 +294,12 @@ $(ARCHIVEDIR):
 archive: $(ARCHIVEDIR) guide howto
 	cp $(PDFDIR)/Samba-HOWTO-Collection.pdf $(ARCHIVEDIR)/TOSHARG-`date +%Y%m%d`.pdf
 	cp $(PDFDIR)/Samba-Guide.pdf $(ARCHIVEDIR)/S3bE-`date +%Y%m%d`.pdf
+
+# XSL scripts
+xslt/html.xsl: xslt/html-common.xsl settings.xsl
+xslt/html-chunk.xsl: xslt/html-common.xsl settings.xsl
+xslt/latex.xsl: settings.xsl
+xslt/expand-sambadoc.xsl: settings.xsl
+xslt/generate-attributions.xsl: 
+xslt/man.xsl:
+xslt/pearson.xsl:
diff --git a/docs/devel/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml
similarity index 100%
rename from docs/devel/CodingSuggestions.xml
rename to docs/Samba-Developers-Guide/CodingSuggestions.xml
diff --git a/docs/devel/NetBIOS.xml b/docs/Samba-Developers-Guide/NetBIOS.xml
similarity index 100%
rename from docs/devel/NetBIOS.xml
rename to docs/Samba-Developers-Guide/NetBIOS.xml
diff --git a/docs/devel/Tracing.xml b/docs/Samba-Developers-Guide/Tracing.xml
similarity index 100%
rename from docs/devel/Tracing.xml
rename to docs/Samba-Developers-Guide/Tracing.xml
diff --git a/docs/devel/architecture.xml b/docs/Samba-Developers-Guide/architecture.xml
similarity index 100%
rename from docs/devel/architecture.xml
rename to docs/Samba-Developers-Guide/architecture.xml
diff --git a/docs/devel/cifsntdomain.xml b/docs/Samba-Developers-Guide/cifsntdomain.xml
similarity index 100%
rename from docs/devel/cifsntdomain.xml
rename to docs/Samba-Developers-Guide/cifsntdomain.xml
diff --git a/docs/devel/contributing.xml b/docs/Samba-Developers-Guide/contributing.xml
similarity index 100%
rename from docs/devel/contributing.xml
rename to docs/Samba-Developers-Guide/contributing.xml
diff --git a/docs/devel/debug.xml b/docs/Samba-Developers-Guide/debug.xml
similarity index 100%
rename from docs/devel/debug.xml
rename to docs/Samba-Developers-Guide/debug.xml
diff --git a/docs/devel/encryption.xml b/docs/Samba-Developers-Guide/encryption.xml
similarity index 100%
rename from docs/devel/encryption.xml
rename to docs/Samba-Developers-Guide/encryption.xml
diff --git a/docs/devel/gencache.xml b/docs/Samba-Developers-Guide/gencache.xml
similarity index 96%
rename from docs/devel/gencache.xml
rename to docs/Samba-Developers-Guide/gencache.xml
index 265461c5e38..94184bf865e 100644
--- a/docs/devel/gencache.xml
+++ b/docs/Samba-Developers-Guide/gencache.xml
@@ -4,6 +4,7 @@
   <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
   %global_entities;
 ]>
+
 <chapter id="gencache">
 <chapterinfo>
 	<author>
@@ -54,8 +55,8 @@ kept together. The form the record has is:
 </para>
 
 <para><programlisting>
-key:     &lt;string&bt;
-value:   &lt;12-digit timeout&bt;/&lt;string&gt;
+key:     &lt;string&gt;
+value:   &lt;12-digit timeout&gt;/&lt;string&gt;
 </programlisting></para>
 
 <para>The timeout part is the ASCII representation of
@@ -118,8 +119,6 @@ void gencache_iterate(void (*fn)(const char* key, const char *value, time_t time
 
 </programlisting></para>
 
-<sect1>
-<title>Writing your own caching layer</title>
 </sect1>
 
 </chapter>
diff --git a/docs/devel/index.xml b/docs/Samba-Developers-Guide/index.xml
similarity index 96%
rename from docs/devel/index.xml
rename to docs/Samba-Developers-Guide/index.xml
index 30e18b20ba3..dfbe726a131 100644
--- a/docs/devel/index.xml
+++ b/docs/Samba-Developers-Guide/index.xml
@@ -39,12 +39,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 </abstract>
 
 </bookinfo>
-<preface>
-	<title>Attributions</title>
-
-	<xi:include href="attributions.xml"/>
-</preface>
-	
+<xi:include href="../Samba-Developers-Guide-attributions.xml"/>
 
 <!-- Contents -->
 <toc/>
diff --git a/docs/devel/internals.xml b/docs/Samba-Developers-Guide/internals.xml
similarity index 100%
rename from docs/devel/internals.xml
rename to docs/Samba-Developers-Guide/internals.xml
diff --git a/docs/devel/modules.xml b/docs/Samba-Developers-Guide/modules.xml
similarity index 100%
rename from docs/devel/modules.xml
rename to docs/Samba-Developers-Guide/modules.xml
diff --git a/docs/devel/packagers.xml b/docs/Samba-Developers-Guide/packagers.xml
similarity index 100%
rename from docs/devel/packagers.xml
rename to docs/Samba-Developers-Guide/packagers.xml
diff --git a/docs/devel/parsing.xml b/docs/Samba-Developers-Guide/parsing.xml
similarity index 100%
rename from docs/devel/parsing.xml
rename to docs/Samba-Developers-Guide/parsing.xml
diff --git a/docs/devel/printing.xml b/docs/Samba-Developers-Guide/printing.xml
similarity index 100%
rename from docs/devel/printing.xml
rename to docs/Samba-Developers-Guide/printing.xml
diff --git a/docs/devel/registry.dot b/docs/Samba-Developers-Guide/registry.dot
similarity index 100%
rename from docs/devel/registry.dot
rename to docs/Samba-Developers-Guide/registry.dot
diff --git a/docs/devel/registry.xml b/docs/Samba-Developers-Guide/registry.xml
similarity index 100%
rename from docs/devel/registry.xml
rename to docs/Samba-Developers-Guide/registry.xml
diff --git a/docs/devel/rpc_plugin.xml b/docs/Samba-Developers-Guide/rpc_plugin.xml
similarity index 100%
rename from docs/devel/rpc_plugin.xml
rename to docs/Samba-Developers-Guide/rpc_plugin.xml
diff --git a/docs/devel/unix-smb.xml b/docs/Samba-Developers-Guide/unix-smb.xml
similarity index 100%
rename from docs/devel/unix-smb.xml
rename to docs/Samba-Developers-Guide/unix-smb.xml
diff --git a/docs/devel/vfs.xml b/docs/Samba-Developers-Guide/vfs.xml
similarity index 100%
rename from docs/devel/vfs.xml
rename to docs/Samba-Developers-Guide/vfs.xml
diff --git a/docs/devel/windows-debug.xml b/docs/Samba-Developers-Guide/windows-debug.xml
similarity index 100%
rename from docs/devel/windows-debug.xml
rename to docs/Samba-Developers-Guide/windows-debug.xml
diff --git a/docs/devel/wins.xml b/docs/Samba-Developers-Guide/wins.xml
similarity index 100%
rename from docs/devel/wins.xml
rename to docs/Samba-Developers-Guide/wins.xml
diff --git a/docs/guide/Chap01-WindowsNetworkingPrimer.xml b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
similarity index 93%
rename from docs/guide/Chap01-WindowsNetworkingPrimer.xml
rename to docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index 893a7629ee9..d677e4cba36 100644
--- a/docs/guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -288,29 +288,15 @@
 		A screenshot of a later stage of the same capture is shown in <link linkend="pktcap02"/>.
 		</para>
 
-<figure id="pktcap01">
-	<title>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/WINREPRESSME-Capture.png" scale="53" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/WINREPRESSME-Capture.png" scale="53" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="pktcap01">
+			<imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
+			<description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+		</image>
 
-<figure id="pktcap02">
-	<title>Windows Me &smbmdash; Later Broadcast Sample</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/WINREPRESSME-Capture2.png" scale="57" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/WINREPRESSME-Capture2.png" scale="57" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="pktcap02">
+			<description>Windows Me &smbmdash; Later Broadcast Sample</description>
+			<imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
+		</image>
 
 	  <para><indexterm>
 	      <primary>Local Master Browser</primary>
@@ -614,17 +600,10 @@
 
 		</sect3>
 
-<figure id="hostannounce">
-        <title>Typical Windows 9x/Me Host Announcement</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/HostAnnouncment.png" scale="55" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/HostAnnouncment.png" scale="55" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="hostannounce">
+			<description>Typical Windows 9x/Me Host Announcement</description>
+			<imagefile scale="55">HostAnnouncment.png</imagefile>
+		</image>
 
 	</sect2>
 
@@ -745,17 +724,11 @@
 		<link linkend="nullconnect"/>.
 		</para>
 
-<figure id="nullconnect">
-        <title>Typical Windows 9x/Me NULL SessionSetUp AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/NullConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="nullconnect">
+			<description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
+
+			<imagefile scale="65">NullConnect.png</imagefile>
+		</image>
 
 		<para>
 	    	<indexterm><primary>nobody</primary></indexterm>
@@ -769,17 +742,10 @@
 		is shown in <link linkend="userconnect"/>.
 		</para>
 
-<figure id="userconnect">
-        <title>Typical Windows 9x/Me User SessionSetUp AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/UserConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/UserConnect.png" scale="65" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+		<image id="userconnect">
+			<description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
+			<imagefile scale="65">UserConnect.png</imagefile>
+		</image>
 
 	 	<para>
 		<indexterm><primary>encrypted</primary></indexterm>
@@ -931,29 +897,15 @@
 
 	</procedure>
 
-<figure id="XPCap01">
-        <title>Typical Windows XP NULL Session Setup AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/WindowsXP-NullConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/WindowsXP-NullConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+	<image id="XPCap01">
+        <description>Typical Windows XP NULL Session Setup AndX Request</description>
+		<imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+	</image>
 
-<figure id="XPCap02">
-        <title>Typical Windows XP User Session Setup AndX Request</title>
-        <mediaobject>
-                <imageobject role="latex">
-                        <imagedata fileref="guide/images/WindowsXP-UserConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-                <imageobject>
-                        <imagedata fileref="guide/images/WindowsXP-UserConnection.png" scale="70" scalefit="1"/>
-                </imageobject>
-        </mediaobject>
-</figure>
+	<image id="XPCap02">
+        <description>Typical Windows XP User Session Setup AndX Request</description>
+		<imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
+	</image>
 
 		<sect3>
 		<title>Discussion</title>
diff --git a/docs/guide/Chap02-SimpleOfficeServer.xml b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
similarity index 98%
rename from docs/guide/Chap02-SimpleOfficeServer.xml
rename to docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 52e27bd6ce0..4e42b520394 100644
--- a/docs/guide/Chap02-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -496,17 +496,10 @@
 		The office network is built as shown in <link linkend="charitynet"/>.
 		</para>
 
-<figure id="charitynet">
-	<title>Charity Administration Office Network</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/Charity-Network.png" scale="100" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/Charity-Network.png" scale="100" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="charitynet">
+			<description>Charity Administration Office Network</description>
+			<imagefile scale="100">Charity-Network.png</imagefile>
+		</image>
 
 		<procedure>
 		<title>Samba Server Configuration</title>
@@ -992,17 +985,10 @@ C:\WINDOWS: regedit ME-dpwc.reg
 		start of Samba configuration. The following prescriptive steps may now commence.
 		</para>
 
-		<figure id="acctingnet2">
-			<title>Accounting Office Network Topology</title>
-			<mediaobject>
-				<imageobject role="latex">
-					<imagedata fileref="guide/images/AccountingNetwork.png" scale="100" scalefit="1"/>
-				</imageobject>
-				<imageobject>
-					<imagedata fileref="guide/images/AccountingNetwork.png" scale="100" scalefit="1"/>
-				</imageobject>
-			</mediaobject>
-		</figure>
+		<image id="acctingnet2">
+			<description>Accounting Office Network Topology</description>
+			<imagefile scale="100">AccountingNetwork.png</imagefile>
+		</image>
 
 		<table id="acctingnet">
 			<title>Accounting Office Network Information</title>
diff --git a/docs/guide/Chap03-TheSmallOffice.xml b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
similarity index 99%
rename from docs/guide/Chap03-TheSmallOffice.xml
rename to docs/Samba-Guide/Chap03-TheSmallOffice.xml
index e50af189f1a..f874a8b6788 100644
--- a/docs/guide/Chap03-TheSmallOffice.xml
+++ b/docs/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -302,17 +302,10 @@
 	by setting the sticky bit (set UID/GID) on the top-level directories.
 	</para>
 
-<figure id="acct2net">
-	<title>Abmas Accounting &smbmdash; 52 User Network Topology</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/acct2net.png" scale="100" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/acct2net.png" scale="100" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="acct2net">
+		<description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
+		<imagefile scale="100">acct2net.png</imagefile>
+	</image>
 
 	<procedure>
 		<step><para>
diff --git a/docs/guide/Chap04-SecureOfficeServer.xml b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
similarity index 99%
rename from docs/guide/Chap04-SecureOfficeServer.xml
rename to docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index fb375187a64..5ec4ab2166f 100644
--- a/docs/guide/Chap04-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -162,17 +162,10 @@
 			</tgroup>
 		</table>
 
-<figure id="ch04net">
-	<title>Abmas Network Topology &smbmdash; 130 Users</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap4-net.png" scale="90" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap4-net.png" scale="90" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+		<image id="ch04net">
+			<description>Abmas Network Topology &smbmdash; 130 Users</description>
+			<imagefile scale="90">chap4-net.png</imagefile>
+		</image>
 
 		<para>
 		Christine has recommended that desktop systems should be installed from a single cloned
diff --git a/docs/guide/Chap05-500UserNetwork.xml b/docs/Samba-Guide/Chap05-500UserNetwork.xml
similarity index 99%
rename from docs/guide/Chap05-500UserNetwork.xml
rename to docs/Samba-Guide/Chap05-500UserNetwork.xml
index 435d6cea46d..3c679c1b095 100644
--- a/docs/guide/Chap05-500UserNetwork.xml
+++ b/docs/Samba-Guide/Chap05-500UserNetwork.xml
@@ -325,17 +325,10 @@
 	selected hardware that is appropriate to the task.
 	</para>
 
-<figure id="chap05net">
-	<title>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap5-net.png" scale="80" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap5-net.png" scale="80" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap05net">
+		<description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
+		<imagefile scale="80">chap5-net.png</imagefile>
+	</image>
 
 	<sect2 id="ch5-dnshcp-setup">
 	<title>Installation of DHCP, DNS, and Samba Control Files</title>
diff --git a/docs/guide/Chap06-MakingHappyUsers.xml b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
similarity index 99%
rename from docs/guide/Chap06-MakingHappyUsers.xml
rename to docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index b80bd2eed23..c8a547ac679 100644
--- a/docs/guide/Chap06-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -574,17 +574,10 @@
 	of the UNIX username to the UID. The relationships are demonstrated in <link linkend="ch6-LDAPdiag"/>.
 	</para>
 
-	<figure id="ch6-LDAPdiag">
-		<title>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/UNIX-Samba-and-LDAP.png" scale="70" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/UNIX-Samba-and-LDAP.png" scale="70" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch6-LDAPdiag">
+		<description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
+		<imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
+	</image>
 
 	<para><indexterm>
 	    <primary>security</primary>
@@ -965,19 +958,10 @@
 	that you will install additional file servers, and possibly additional BDCs.
 	</para>
 
-<figure id="chap6net">
-	<title>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="70" scalefit="1"
-			  fileref="guide/images/chap6-net.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="70" scalefit="1"
-			  fileref="guide/images/chap6-net.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap6net">
+		<description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
+		<imagefile scale="70">chap6-net.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>SUSE Linux</primary>
@@ -3146,19 +3130,10 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 
 	</procedure>
 
-<figure id="XP-screen001">
-	<title>Windows XP Professional &smbmdash; User Shared Folders</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="65" scalefit="1"
-			  fileref="guide/images/XP-screen001.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="65" scalefit="1"
-			  fileref="guide/images/XP-screen001.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="XP-screen001">
+		<description>Windows XP Professional &smbmdash; User Shared Folders</description>
+		<imagefile scale="65">XP-screen001.png</imagefile>
+	</image>
 
 <table id="proffold">
 	<title>Default Profile Redirections</title>
diff --git a/docs/guide/Chap07-2000UserNetwork.xml b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
similarity index 96%
rename from docs/guide/Chap07-2000UserNetwork.xml
rename to docs/Samba-Guide/Chap07-2000UserNetwork.xml
index a8f7b91e2d3..73134cf1085 100644
--- a/docs/guide/Chap07-2000UserNetwork.xml
+++ b/docs/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -708,33 +708,15 @@
 	    procedures for managing the directory, as retroactive correction of
 	    inconsistent directory information can be exceedingly difficult.</para>
 
-<figure id="chap7net">
-	<title>Network Topology &smbmdash; 2000 User Complex Design A</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net-Ar.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net-Ar.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap7net">
+		<description>Network Topology &smbmdash; 2000 User Complex Design A</description>
+		<imagefile scale="80">chap7-net-Ar.png</imagefile>
+	</image>
 
-<figure id="chap7net2">
-	<title>Network Topology &smbmdash; 2000 User Complex Design B</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net2-Br.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-net2-Br.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap7net2">
+		<description>Network Topology &smbmdash; 2000 User Complex Design B</description>
+		<imagefile scale="80">chap7-net2-Br.png</imagefile>
+	</image>
 
 	</sect3>
 
@@ -776,19 +758,10 @@
 	(obtaining a UNIX UID/GID) using the specific systems shown.
 	</para>
 
-<figure id="chap7idres">
-	<title>Samba and Authentication Backend Search Pathways</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-idresol.png"/>
-		</imageobject>
-		<imageobject>
-			<imagedata scale="80" scalefit="1"
-			  fileref="guide/images/chap7-idresol.png"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="chap7idres">
+		<description>Samba and Authentication Backend Search Pathways</description>
+		<imagefile scale="80">chap7-idresol.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>smbpasswd</primary>
@@ -826,17 +799,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz
 </screen>
 	This configuration tells Samba to use a single LDAP server as shown in
 	<link linkend="ch7singleLDAP"/>.
-	<figure id="ch7singleLDAP">
-		<title>Samba Configuration to Use a Single LDAP Server</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-singleLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-singleLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7singleLDAP">
+		<description>Samba Configuration to Use a Single LDAP Server</description>
+		<imagefile scale="100">ch7-singleLDAP.png</imagefile>
+	</image>
 	<indexterm>
 	  <primary>LDAP</primary>
 	  <secondary>fail-over</secondary>
@@ -855,17 +821,10 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
 </screen>
 	This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary,
 	as shown in <link linkend="ch7dualLDAP"/>.
-	<figure id="ch7dualLDAP">
-		<title>Samba Configuration to Use a Dual (Fail-over) LDAP Server</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-fail-overLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-fail-overLDAP.png" scale="100" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7dualLDAP">
+		<description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
+		<imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
+	</image>
       </para>
 
       <para>Some folks have tried to implement this without the use of
@@ -887,17 +846,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	configuration is shown in <link linkend="ch7dualadd"/>
 	</para>
 
-	<figure id="ch7dualadd">
-		<title>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP.png" scale="80" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP.png" scale="80" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="ch7dualadd">
+		<description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
+		<imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
+	</image>
 
 	<para>
 	If, however, each LDAP database contains unique information, this may 
@@ -906,17 +858,10 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
 	An example of this configuration is shown in <link linkend="ch7dualok"/>.
         </para>
 
-	<figure id="ch7dualok">
-		<title>Samba Configuration to Use Two LDAP Databases - The result is additive.</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP-Ok.png" scale="80" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/ch7-dual-additive-LDAP-Ok.png" scale="80" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+		<image id="ch7dualok">
+			<description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
+			<imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
+		</image>
 
 	<note><para>
 	When the use of ldapsam is specified twice, as shown here, it is imperative
diff --git a/docs/guide/Chap08-MigrateNT4Samba3.xml b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
similarity index 98%
rename from docs/guide/Chap08-MigrateNT4Samba3.xml
rename to docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 29f25a77643..a6b196f3651 100644
--- a/docs/guide/Chap08-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -182,17 +182,10 @@
 		from a Windows NT4 Domain to a Samba Domain.
 		</para>
 
-		<figure id="ch8-migration">
-			<title>Schematic Explaining the <command>net rpc vampire</command> Process</title>
-			<mediaobject>
-				<imageobject role="latex">
-					<imagedata fileref="guide/images/ch8-migration.png" scale="80" scalefit="1"/>
-				</imageobject>
-				<imageobject>
-					<imagedata fileref="guide/images/ch8-migration.png" scale="80" scalefit="1"/>
-				</imageobject>
-			</mediaobject>
-		</figure>
+		<image id="ch8-migration">
+			<description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
+			<imagefile scale="80">ch8-migration.png</imagefile>
+		</image>
 
 		<para>
 		In any case, the migration process involves the following steps:
@@ -303,17 +296,10 @@
 		an LDAP backend.
 		</para>
 
-	<figure id="NT4DUM">
-		<title>View of Accounts in NT4 Domain User Manager</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/UserMgrNT4.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/UserMgrNT4.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+		<image id="NT4DUM">
+			<description>View of Accounts in NT4 Domain User Manager</description>
+			<imagefile scale="50">UserMgrNT4.png</imagefile>
+		</image>
 
 	</sect2>
 
diff --git a/docs/guide/Chap09-AddingUNIXClients.xml b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
similarity index 98%
rename from docs/guide/Chap09-AddingUNIXClients.xml
rename to docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 83720941386..e46fc22396f 100644
--- a/docs/guide/Chap09-AddingUNIXClients.xml
+++ b/docs/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -28,17 +28,10 @@
 	<link linkend="ch09openmag"/>.
 	</para>
 
-<figure id="ch09openmag">
-	<title>Open Magazine Samba Survey</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/openmag.png" scale="60" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/openmag.png" scale="60" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="ch09openmag">
+		<description>Open Magazine Samba Survey</description>
+		<imagefile scale="60">openmag.png</imagefile>
+	</image>
 
 	<para>
 	While Domain Control is an exciting subject, basic file and print sharing remains the staple bread-and-butter
@@ -522,17 +515,10 @@
 	Member server within a Samba Domain Control network.
 	</para>
 
-<figure id="ch9-sambadc">
-	<title>Samba Domain: Samba Member Server</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+<image id="ch9-sambadc">
+	<description>Samba Domain: Samba Member Server</description>
+	<imagefile scale="75">chap9-SambaDC.png</imagefile>
+</image>
 
 	<para><indexterm>
 	    <primary>IDMAP</primary>
@@ -1111,17 +1097,10 @@ aliases:        files
 	Domain Name is <constant>LONDON</constant> and the server name is <constant>W2K3S</constant>.
 	</para>
 
-<figure id="ch9-adsdc">
-	<title>Active Directory Domain: Samba Member Server</title>
-	<mediaobject>
-		<imageobject role="latex">
-			<imagedata fileref="guide/images/chap9-ADSDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-		<imageobject>
-			<imagedata fileref="guide/images/chap9-SambaDC.png" scale="75" scalefit="1"/>
-		</imageobject>
-	</mediaobject>
-</figure>
+	<image id="ch9-adsdc">
+		<description>Active Directory Domain: Samba Member Server</description>
+		<imagefile scale="75">chap9-ADSDC.png</imagefile>
+	</image>
 
 	<procedure>
 	  <step><para><indexterm>
diff --git a/docs/guide/Chap10-KerberosFastStart.xml b/docs/Samba-Guide/Chap10-KerberosFastStart.xml
similarity index 100%
rename from docs/guide/Chap10-KerberosFastStart.xml
rename to docs/Samba-Guide/Chap10-KerberosFastStart.xml
diff --git a/docs/guide/Chap10b-DomainAppsSupport.xml b/docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
similarity index 100%
rename from docs/guide/Chap10b-DomainAppsSupport.xml
rename to docs/Samba-Guide/Chap10b-DomainAppsSupport.xml
diff --git a/docs/guide/Chap11-HighAvailability.xml b/docs/Samba-Guide/Chap11-HighAvailability.xml
similarity index 100%
rename from docs/guide/Chap11-HighAvailability.xml
rename to docs/Samba-Guide/Chap11-HighAvailability.xml
diff --git a/docs/guide/Chap12-Appendix.xml b/docs/Samba-Guide/Chap12-Appendix.xml
similarity index 96%
rename from docs/guide/Chap12-Appendix.xml
rename to docs/Samba-Guide/Chap12-Appendix.xml
index 6b6550dc2ee..c3b244c405d 100644
--- a/docs/guide/Chap12-Appendix.xml
+++ b/docs/Samba-Guide/Chap12-Appendix.xml
@@ -1194,17 +1194,10 @@ example:
 	An example of the LAM login screen is provided in <link linkend="lam-login"/>.
 	</para>
 
-	<figure id="lam-login">
-		<title>The LDAP Account Manager Login Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-login.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-login.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-login">
+		<description>The LDAP Account Manager Login Screen</description>
+		<imagefile scale="50">lam-login.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>LAM</primary>
@@ -1220,17 +1213,10 @@ example:
 	using LAM to add additional users and groups.
 	</para>
 
-	<figure id="lam-config">
-		<title>The LDAP Account Manager Configuration Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-config.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-config.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-config">
+		<description>The LDAP Account Manager Configuration Screen</description>
+		<imagefile scale="50">lam-config.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>PDF</primary>
@@ -1254,17 +1240,10 @@ example:
 	finished editing simply press the <guimenu>Final</guimenu> button.
 	</para>
 
-	<figure id="lam-user">
-		<title>The LDAP Account Manager User Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-users.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-users.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-user">
+		<description>The LDAP Account Manager User Edit Screen</description>
+		<imagefile scale="50">lam-users.png</imagefile>
+	</image>
 
 	<para>
 	The edit screen for groups is shown in <link linkend="lam-group"/>. As with the edit screen
@@ -1273,29 +1252,15 @@ example:
 	memberships. 
 	</para>
 
-	<figure id="lam-group">
-		<title>The LDAP Account Manager Group Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-groups.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-groups.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-group">
+		<description>The LDAP Account Manager Group Edit Screen</description>
+		<imagefile scale="50">lam-groups.png</imagefile>
+	</image>
 
-	<figure id="lam-group-mem">
-		<title>The LDAP Account Manager Group Membership Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-group-members.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-group-members.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-group-mem">
+		<description>The LDAP Account Manager Group Membership Edit Screen</description>
+		<imagefile scale="50">lam-group-members.png</imagefile>
+	</image>
 
       <para><indexterm>
 	  <primary>smbldap-tools</primary>
@@ -1307,17 +1272,10 @@ example:
 	will, in most cases, not be used.
 	</para>
 
-	<figure id="lam-host">
-		<title>The LDAP Account Manager Host Edit Screen</title>
-		<mediaobject>
-			<imageobject role="latex">
-				<imagedata fileref="guide/images/lam-hosts.png" scale="50" scalefit="1"/>
-			</imageobject>
-			<imageobject>
-				<imagedata fileref="guide/images/lam-hosts.png" scale="50" scalefit="1"/>
-			</imageobject>
-		</mediaobject>
-	</figure>
+	<image id="lam-host">
+		<description>The LDAP Account Manager Host Edit Screen</description>
+		<imagefile scale="50">lam-hosts.png</imagefile>
+	</image>
 
 	<para>
 	One aspect of LAM that may annoy some users is the way it forces certain conventions on
diff --git a/docs/guide/acknowledgements.xml b/docs/Samba-Guide/acknowledgements.xml
similarity index 100%
rename from docs/guide/acknowledgements.xml
rename to docs/Samba-Guide/acknowledgements.xml
diff --git a/docs/guide/conventions.xml b/docs/Samba-Guide/conventions.xml
similarity index 100%
rename from docs/guide/conventions.xml
rename to docs/Samba-Guide/conventions.xml
diff --git a/docs/guide/foreword.xml b/docs/Samba-Guide/foreword.xml
similarity index 100%
rename from docs/guide/foreword.xml
rename to docs/Samba-Guide/foreword.xml
diff --git a/docs/guide/front-matter.xml b/docs/Samba-Guide/front-matter.xml
similarity index 100%
rename from docs/guide/front-matter.xml
rename to docs/Samba-Guide/front-matter.xml
diff --git a/docs/guide/glossary.xml b/docs/Samba-Guide/glossary.xml
similarity index 100%
rename from docs/guide/glossary.xml
rename to docs/Samba-Guide/glossary.xml
diff --git a/docs/guide/gpl.xml b/docs/Samba-Guide/gpl.xml
similarity index 100%
rename from docs/guide/gpl.xml
rename to docs/Samba-Guide/gpl.xml
diff --git a/docs/guide/images/AccountingNetwork.dia b/docs/Samba-Guide/images/AccountingNetwork.dia
similarity index 100%
rename from docs/guide/images/AccountingNetwork.dia
rename to docs/Samba-Guide/images/AccountingNetwork.dia
diff --git a/docs/guide/images/AccountingNetwork.png b/docs/Samba-Guide/images/AccountingNetwork.png
similarity index 100%
rename from docs/guide/images/AccountingNetwork.png
rename to docs/Samba-Guide/images/AccountingNetwork.png
diff --git a/docs/guide/images/Charity-Network.dia b/docs/Samba-Guide/images/Charity-Network.dia
similarity index 100%
rename from docs/guide/images/Charity-Network.dia
rename to docs/Samba-Guide/images/Charity-Network.dia
diff --git a/docs/guide/images/Charity-Network.png b/docs/Samba-Guide/images/Charity-Network.png
similarity index 100%
rename from docs/guide/images/Charity-Network.png
rename to docs/Samba-Guide/images/Charity-Network.png
diff --git a/docs/guide/images/Domain-WorkgroupAnnouncement.png b/docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png
similarity index 100%
rename from docs/guide/images/Domain-WorkgroupAnnouncement.png
rename to docs/Samba-Guide/images/Domain-WorkgroupAnnouncement.png
diff --git a/docs/guide/images/HostAnnouncment.png b/docs/Samba-Guide/images/HostAnnouncment.png
similarity index 100%
rename from docs/guide/images/HostAnnouncment.png
rename to docs/Samba-Guide/images/HostAnnouncment.png
diff --git a/docs/guide/images/LocalMasterAnnouncement.png b/docs/Samba-Guide/images/LocalMasterAnnouncement.png
similarity index 100%
rename from docs/guide/images/LocalMasterAnnouncement.png
rename to docs/Samba-Guide/images/LocalMasterAnnouncement.png
diff --git a/docs/guide/images/NullConnect.png b/docs/Samba-Guide/images/NullConnect.png
similarity index 100%
rename from docs/guide/images/NullConnect.png
rename to docs/Samba-Guide/images/NullConnect.png
diff --git a/docs/guide/images/UNIX-Samba-and-LDAP.dia b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia
similarity index 100%
rename from docs/guide/images/UNIX-Samba-and-LDAP.dia
rename to docs/Samba-Guide/images/UNIX-Samba-and-LDAP.dia
diff --git a/docs/guide/images/UNIX-Samba-and-LDAP.png b/docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
similarity index 100%
rename from docs/guide/images/UNIX-Samba-and-LDAP.png
rename to docs/Samba-Guide/images/UNIX-Samba-and-LDAP.png
diff --git a/docs/guide/images/UserConnect.png b/docs/Samba-Guide/images/UserConnect.png
similarity index 100%
rename from docs/guide/images/UserConnect.png
rename to docs/Samba-Guide/images/UserConnect.png
diff --git a/docs/guide/images/UserMgrNT4.png b/docs/Samba-Guide/images/UserMgrNT4.png
similarity index 100%
rename from docs/guide/images/UserMgrNT4.png
rename to docs/Samba-Guide/images/UserMgrNT4.png
diff --git a/docs/guide/images/WINREPRESSME-Capture.png b/docs/Samba-Guide/images/WINREPRESSME-Capture.png
similarity index 100%
rename from docs/guide/images/WINREPRESSME-Capture.png
rename to docs/Samba-Guide/images/WINREPRESSME-Capture.png
diff --git a/docs/guide/images/WINREPRESSME-Capture2.png b/docs/Samba-Guide/images/WINREPRESSME-Capture2.png
similarity index 100%
rename from docs/guide/images/WINREPRESSME-Capture2.png
rename to docs/Samba-Guide/images/WINREPRESSME-Capture2.png
diff --git a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
similarity index 100%
rename from docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
rename to docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
diff --git a/docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png b/docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
similarity index 100%
rename from docs/guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
rename to docs/Samba-Guide/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
diff --git a/docs/guide/images/WindowsXP-NullConnection.png b/docs/Samba-Guide/images/WindowsXP-NullConnection.png
similarity index 100%
rename from docs/guide/images/WindowsXP-NullConnection.png
rename to docs/Samba-Guide/images/WindowsXP-NullConnection.png
diff --git a/docs/guide/images/WindowsXP-UserConnection.png b/docs/Samba-Guide/images/WindowsXP-UserConnection.png
similarity index 100%
rename from docs/guide/images/WindowsXP-UserConnection.png
rename to docs/Samba-Guide/images/WindowsXP-UserConnection.png
diff --git a/docs/guide/images/XP-screen001.png b/docs/Samba-Guide/images/XP-screen001.png
similarity index 100%
rename from docs/guide/images/XP-screen001.png
rename to docs/Samba-Guide/images/XP-screen001.png
diff --git a/docs/guide/images/acct2net.dia b/docs/Samba-Guide/images/acct2net.dia
similarity index 100%
rename from docs/guide/images/acct2net.dia
rename to docs/Samba-Guide/images/acct2net.dia
diff --git a/docs/guide/images/acct2net.png b/docs/Samba-Guide/images/acct2net.png
similarity index 100%
rename from docs/guide/images/acct2net.png
rename to docs/Samba-Guide/images/acct2net.png
diff --git a/docs/guide/images/ch7-dual-additive-LDAP-Ok.dia b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia
similarity index 100%
rename from docs/guide/images/ch7-dual-additive-LDAP-Ok.dia
rename to docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.dia
diff --git a/docs/guide/images/ch7-dual-additive-LDAP-Ok.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
similarity index 100%
rename from docs/guide/images/ch7-dual-additive-LDAP-Ok.png
rename to docs/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
diff --git a/docs/guide/images/ch7-dual-additive-LDAP.dia b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia
similarity index 100%
rename from docs/guide/images/ch7-dual-additive-LDAP.dia
rename to docs/Samba-Guide/images/ch7-dual-additive-LDAP.dia
diff --git a/docs/guide/images/ch7-dual-additive-LDAP.png b/docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
similarity index 100%
rename from docs/guide/images/ch7-dual-additive-LDAP.png
rename to docs/Samba-Guide/images/ch7-dual-additive-LDAP.png
diff --git a/docs/guide/images/ch7-fail-overLDAP.dia b/docs/Samba-Guide/images/ch7-fail-overLDAP.dia
similarity index 100%
rename from docs/guide/images/ch7-fail-overLDAP.dia
rename to docs/Samba-Guide/images/ch7-fail-overLDAP.dia
diff --git a/docs/guide/images/ch7-fail-overLDAP.png b/docs/Samba-Guide/images/ch7-fail-overLDAP.png
similarity index 100%
rename from docs/guide/images/ch7-fail-overLDAP.png
rename to docs/Samba-Guide/images/ch7-fail-overLDAP.png
diff --git a/docs/guide/images/ch7-singleLDAP.dia b/docs/Samba-Guide/images/ch7-singleLDAP.dia
similarity index 100%
rename from docs/guide/images/ch7-singleLDAP.dia
rename to docs/Samba-Guide/images/ch7-singleLDAP.dia
diff --git a/docs/guide/images/ch7-singleLDAP.png b/docs/Samba-Guide/images/ch7-singleLDAP.png
similarity index 100%
rename from docs/guide/images/ch7-singleLDAP.png
rename to docs/Samba-Guide/images/ch7-singleLDAP.png
diff --git a/docs/guide/images/ch8-migration.dia b/docs/Samba-Guide/images/ch8-migration.dia
similarity index 100%
rename from docs/guide/images/ch8-migration.dia
rename to docs/Samba-Guide/images/ch8-migration.dia
diff --git a/docs/guide/images/ch8-migration.png b/docs/Samba-Guide/images/ch8-migration.png
similarity index 100%
rename from docs/guide/images/ch8-migration.png
rename to docs/Samba-Guide/images/ch8-migration.png
diff --git a/docs/guide/images/chap4-net.dia b/docs/Samba-Guide/images/chap4-net.dia
similarity index 100%
rename from docs/guide/images/chap4-net.dia
rename to docs/Samba-Guide/images/chap4-net.dia
diff --git a/docs/guide/images/chap4-net.png b/docs/Samba-Guide/images/chap4-net.png
similarity index 100%
rename from docs/guide/images/chap4-net.png
rename to docs/Samba-Guide/images/chap4-net.png
diff --git a/docs/guide/images/chap5-net.dia b/docs/Samba-Guide/images/chap5-net.dia
similarity index 100%
rename from docs/guide/images/chap5-net.dia
rename to docs/Samba-Guide/images/chap5-net.dia
diff --git a/docs/guide/images/chap5-net.png b/docs/Samba-Guide/images/chap5-net.png
similarity index 100%
rename from docs/guide/images/chap5-net.png
rename to docs/Samba-Guide/images/chap5-net.png
diff --git a/docs/guide/images/chap6-net.dia b/docs/Samba-Guide/images/chap6-net.dia
similarity index 100%
rename from docs/guide/images/chap6-net.dia
rename to docs/Samba-Guide/images/chap6-net.dia
diff --git a/docs/guide/images/chap6-net.png b/docs/Samba-Guide/images/chap6-net.png
similarity index 100%
rename from docs/guide/images/chap6-net.png
rename to docs/Samba-Guide/images/chap6-net.png
diff --git a/docs/guide/images/chap7-idresol.dia b/docs/Samba-Guide/images/chap7-idresol.dia
similarity index 100%
rename from docs/guide/images/chap7-idresol.dia
rename to docs/Samba-Guide/images/chap7-idresol.dia
diff --git a/docs/guide/images/chap7-idresol.png b/docs/Samba-Guide/images/chap7-idresol.png
similarity index 100%
rename from docs/guide/images/chap7-idresol.png
rename to docs/Samba-Guide/images/chap7-idresol.png
diff --git a/docs/guide/images/chap7-net-A.dia b/docs/Samba-Guide/images/chap7-net-A.dia
similarity index 100%
rename from docs/guide/images/chap7-net-A.dia
rename to docs/Samba-Guide/images/chap7-net-A.dia
diff --git a/docs/guide/images/chap7-net-A.png b/docs/Samba-Guide/images/chap7-net-A.png
similarity index 100%
rename from docs/guide/images/chap7-net-A.png
rename to docs/Samba-Guide/images/chap7-net-A.png
diff --git a/docs/guide/images/chap7-net-Ar.png b/docs/Samba-Guide/images/chap7-net-Ar.png
similarity index 100%
rename from docs/guide/images/chap7-net-Ar.png
rename to docs/Samba-Guide/images/chap7-net-Ar.png
diff --git a/docs/guide/images/chap7-net.dia b/docs/Samba-Guide/images/chap7-net.dia
similarity index 100%
rename from docs/guide/images/chap7-net.dia
rename to docs/Samba-Guide/images/chap7-net.dia
diff --git a/docs/guide/images/chap7-net.png b/docs/Samba-Guide/images/chap7-net.png
similarity index 100%
rename from docs/guide/images/chap7-net.png
rename to docs/Samba-Guide/images/chap7-net.png
diff --git a/docs/guide/images/chap7-net2-B.dia b/docs/Samba-Guide/images/chap7-net2-B.dia
similarity index 100%
rename from docs/guide/images/chap7-net2-B.dia
rename to docs/Samba-Guide/images/chap7-net2-B.dia
diff --git a/docs/guide/images/chap7-net2-B.png b/docs/Samba-Guide/images/chap7-net2-B.png
similarity index 100%
rename from docs/guide/images/chap7-net2-B.png
rename to docs/Samba-Guide/images/chap7-net2-B.png
diff --git a/docs/guide/images/chap7-net2-Br.png b/docs/Samba-Guide/images/chap7-net2-Br.png
similarity index 100%
rename from docs/guide/images/chap7-net2-Br.png
rename to docs/Samba-Guide/images/chap7-net2-Br.png
diff --git a/docs/guide/images/chap7-net2.dia b/docs/Samba-Guide/images/chap7-net2.dia
similarity index 100%
rename from docs/guide/images/chap7-net2.dia
rename to docs/Samba-Guide/images/chap7-net2.dia
diff --git a/docs/guide/images/chap7-net2.png b/docs/Samba-Guide/images/chap7-net2.png
similarity index 100%
rename from docs/guide/images/chap7-net2.png
rename to docs/Samba-Guide/images/chap7-net2.png
diff --git a/docs/guide/images/chap7-net2r.png b/docs/Samba-Guide/images/chap7-net2r.png
similarity index 100%
rename from docs/guide/images/chap7-net2r.png
rename to docs/Samba-Guide/images/chap7-net2r.png
diff --git a/docs/guide/images/chap7-netr.png b/docs/Samba-Guide/images/chap7-netr.png
similarity index 100%
rename from docs/guide/images/chap7-netr.png
rename to docs/Samba-Guide/images/chap7-netr.png
diff --git a/docs/guide/images/chap9-ADSDC.dia b/docs/Samba-Guide/images/chap9-ADSDC.dia
similarity index 100%
rename from docs/guide/images/chap9-ADSDC.dia
rename to docs/Samba-Guide/images/chap9-ADSDC.dia
diff --git a/docs/guide/images/chap9-ADSDC.png b/docs/Samba-Guide/images/chap9-ADSDC.png
similarity index 100%
rename from docs/guide/images/chap9-ADSDC.png
rename to docs/Samba-Guide/images/chap9-ADSDC.png
diff --git a/docs/guide/images/chap9-SambaDC.dia b/docs/Samba-Guide/images/chap9-SambaDC.dia
similarity index 100%
rename from docs/guide/images/chap9-SambaDC.dia
rename to docs/Samba-Guide/images/chap9-SambaDC.dia
diff --git a/docs/guide/images/chap9-SambaDC.png b/docs/Samba-Guide/images/chap9-SambaDC.png
similarity index 100%
rename from docs/guide/images/chap9-SambaDC.png
rename to docs/Samba-Guide/images/chap9-SambaDC.png
diff --git a/docs/guide/images/lam-config.png b/docs/Samba-Guide/images/lam-config.png
similarity index 100%
rename from docs/guide/images/lam-config.png
rename to docs/Samba-Guide/images/lam-config.png
diff --git a/docs/guide/images/lam-group-members.png b/docs/Samba-Guide/images/lam-group-members.png
similarity index 100%
rename from docs/guide/images/lam-group-members.png
rename to docs/Samba-Guide/images/lam-group-members.png
diff --git a/docs/guide/images/lam-groups.png b/docs/Samba-Guide/images/lam-groups.png
similarity index 100%
rename from docs/guide/images/lam-groups.png
rename to docs/Samba-Guide/images/lam-groups.png
diff --git a/docs/guide/images/lam-hosts.png b/docs/Samba-Guide/images/lam-hosts.png
similarity index 100%
rename from docs/guide/images/lam-hosts.png
rename to docs/Samba-Guide/images/lam-hosts.png
diff --git a/docs/guide/images/lam-login.png b/docs/Samba-Guide/images/lam-login.png
similarity index 100%
rename from docs/guide/images/lam-login.png
rename to docs/Samba-Guide/images/lam-login.png
diff --git a/docs/guide/images/lam-users.png b/docs/Samba-Guide/images/lam-users.png
similarity index 100%
rename from docs/guide/images/lam-users.png
rename to docs/Samba-Guide/images/lam-users.png
diff --git a/docs/guide/images/openmag.png b/docs/Samba-Guide/images/openmag.png
similarity index 100%
rename from docs/guide/images/openmag.png
rename to docs/Samba-Guide/images/openmag.png
diff --git a/docs/guide/images/wxpp001.png b/docs/Samba-Guide/images/wxpp001.png
similarity index 100%
rename from docs/guide/images/wxpp001.png
rename to docs/Samba-Guide/images/wxpp001.png
diff --git a/docs/guide/images/wxpp004.png b/docs/Samba-Guide/images/wxpp004.png
similarity index 100%
rename from docs/guide/images/wxpp004.png
rename to docs/Samba-Guide/images/wxpp004.png
diff --git a/docs/guide/images/wxpp006.png b/docs/Samba-Guide/images/wxpp006.png
similarity index 100%
rename from docs/guide/images/wxpp006.png
rename to docs/Samba-Guide/images/wxpp006.png
diff --git a/docs/guide/images/wxpp007.png b/docs/Samba-Guide/images/wxpp007.png
similarity index 100%
rename from docs/guide/images/wxpp007.png
rename to docs/Samba-Guide/images/wxpp007.png
diff --git a/docs/guide/images/wxpp008.png b/docs/Samba-Guide/images/wxpp008.png
similarity index 100%
rename from docs/guide/images/wxpp008.png
rename to docs/Samba-Guide/images/wxpp008.png
diff --git a/docs/guide/images/wxpp010.png b/docs/Samba-Guide/images/wxpp010.png
similarity index 100%
rename from docs/guide/images/wxpp010.png
rename to docs/Samba-Guide/images/wxpp010.png
diff --git a/docs/guide/images/wxpp011.png b/docs/Samba-Guide/images/wxpp011.png
similarity index 100%
rename from docs/guide/images/wxpp011.png
rename to docs/Samba-Guide/images/wxpp011.png
diff --git a/docs/guide/images/wxpp012.png b/docs/Samba-Guide/images/wxpp012.png
similarity index 100%
rename from docs/guide/images/wxpp012.png
rename to docs/Samba-Guide/images/wxpp012.png
diff --git a/docs/guide/images/wxpp013.png b/docs/Samba-Guide/images/wxpp013.png
similarity index 100%
rename from docs/guide/images/wxpp013.png
rename to docs/Samba-Guide/images/wxpp013.png
diff --git a/docs/guide/images/wxpp015.png b/docs/Samba-Guide/images/wxpp015.png
similarity index 100%
rename from docs/guide/images/wxpp015.png
rename to docs/Samba-Guide/images/wxpp015.png
diff --git a/docs/guide/index.xml b/docs/Samba-Guide/index.xml
similarity index 100%
rename from docs/guide/index.xml
rename to docs/Samba-Guide/index.xml
diff --git a/docs/guide/inside-cover.xml b/docs/Samba-Guide/inside-cover.xml
similarity index 100%
rename from docs/guide/inside-cover.xml
rename to docs/Samba-Guide/inside-cover.xml
diff --git a/docs/guide/preface.xml b/docs/Samba-Guide/preface.xml
similarity index 100%
rename from docs/guide/preface.xml
rename to docs/Samba-Guide/preface.xml
diff --git a/docs/howto/AccessControls.xml b/docs/Samba-HOWTO-Collection/AccessControls.xml
similarity index 100%
rename from docs/howto/AccessControls.xml
rename to docs/Samba-HOWTO-Collection/AccessControls.xml
diff --git a/docs/howto/AdvancedNetworkAdmin.xml b/docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
similarity index 100%
rename from docs/howto/AdvancedNetworkAdmin.xml
rename to docs/Samba-HOWTO-Collection/AdvancedNetworkAdmin.xml
diff --git a/docs/howto/BDC.xml b/docs/Samba-HOWTO-Collection/BDC.xml
similarity index 100%
rename from docs/howto/BDC.xml
rename to docs/Samba-HOWTO-Collection/BDC.xml
diff --git a/docs/howto/Backup.xml b/docs/Samba-HOWTO-Collection/Backup.xml
similarity index 100%
rename from docs/howto/Backup.xml
rename to docs/Samba-HOWTO-Collection/Backup.xml
diff --git a/docs/howto/Bugs.xml b/docs/Samba-HOWTO-Collection/Bugs.xml
similarity index 100%
rename from docs/howto/Bugs.xml
rename to docs/Samba-HOWTO-Collection/Bugs.xml
diff --git a/docs/howto/CUPS-printing.xml b/docs/Samba-HOWTO-Collection/CUPS-printing.xml
similarity index 100%
rename from docs/howto/CUPS-printing.xml
rename to docs/Samba-HOWTO-Collection/CUPS-printing.xml
diff --git a/docs/howto/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml
similarity index 100%
rename from docs/howto/Compiling.xml
rename to docs/Samba-HOWTO-Collection/Compiling.xml
diff --git a/docs/howto/DNS-DHCP-Configuration.xml b/docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
similarity index 100%
rename from docs/howto/DNS-DHCP-Configuration.xml
rename to docs/Samba-HOWTO-Collection/DNS-DHCP-Configuration.xml
diff --git a/docs/howto/Diagnosis.xml b/docs/Samba-HOWTO-Collection/Diagnosis.xml
similarity index 100%
rename from docs/howto/Diagnosis.xml
rename to docs/Samba-HOWTO-Collection/Diagnosis.xml
diff --git a/docs/howto/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml
similarity index 100%
rename from docs/howto/DomainMember.xml
rename to docs/Samba-HOWTO-Collection/DomainMember.xml
diff --git a/docs/howto/FastStart.xml b/docs/Samba-HOWTO-Collection/FastStart.xml
similarity index 100%
rename from docs/howto/FastStart.xml
rename to docs/Samba-HOWTO-Collection/FastStart.xml
diff --git a/docs/howto/Further-Resources.xml b/docs/Samba-HOWTO-Collection/Further-Resources.xml
similarity index 94%
rename from docs/howto/Further-Resources.xml
rename to docs/Samba-HOWTO-Collection/Further-Resources.xml
index 549e0ff6a67..8ca95442be6 100644
--- a/docs/howto/Further-Resources.xml
+++ b/docs/Samba-HOWTO-Collection/Further-Resources.xml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+  <!ENTITY % global_entities SYSTEM '../entities/global.entities'>
+  %global_entities;
+]>
+
 <chapter id="Further-Resources">
 <chapterinfo>
 	&author.jelmer;
diff --git a/docs/howto/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml
similarity index 100%
rename from docs/howto/Group-Mapping.xml
rename to docs/Samba-HOWTO-Collection/Group-Mapping.xml
diff --git a/docs/howto/HighAvailability.xml b/docs/Samba-HOWTO-Collection/HighAvailability.xml
similarity index 100%
rename from docs/howto/HighAvailability.xml
rename to docs/Samba-HOWTO-Collection/HighAvailability.xml
diff --git a/docs/howto/Install.xml b/docs/Samba-HOWTO-Collection/Install.xml
similarity index 100%
rename from docs/howto/Install.xml
rename to docs/Samba-HOWTO-Collection/Install.xml
diff --git a/docs/howto/Integrating-with-Windows.xml b/docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
similarity index 100%
rename from docs/howto/Integrating-with-Windows.xml
rename to docs/Samba-HOWTO-Collection/Integrating-with-Windows.xml
diff --git a/docs/howto/InterdomainTrusts.xml b/docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
similarity index 100%
rename from docs/howto/InterdomainTrusts.xml
rename to docs/Samba-HOWTO-Collection/InterdomainTrusts.xml
diff --git a/docs/howto/IntroSMB.xml b/docs/Samba-HOWTO-Collection/IntroSMB.xml
similarity index 100%
rename from docs/howto/IntroSMB.xml
rename to docs/Samba-HOWTO-Collection/IntroSMB.xml
diff --git a/docs/howto/NT4Migration.xml b/docs/Samba-HOWTO-Collection/NT4Migration.xml
similarity index 100%
rename from docs/howto/NT4Migration.xml
rename to docs/Samba-HOWTO-Collection/NT4Migration.xml
diff --git a/docs/howto/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
similarity index 100%
rename from docs/howto/NetworkBrowsing.xml
rename to docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
diff --git a/docs/howto/Other-Clients.xml b/docs/Samba-HOWTO-Collection/Other-Clients.xml
similarity index 100%
rename from docs/howto/Other-Clients.xml
rename to docs/Samba-HOWTO-Collection/Other-Clients.xml
diff --git a/docs/howto/PAM.xml b/docs/Samba-HOWTO-Collection/PAM.xml
similarity index 100%
rename from docs/howto/PAM.xml
rename to docs/Samba-HOWTO-Collection/PAM.xml
diff --git a/docs/howto/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
similarity index 100%
rename from docs/howto/PDC.xml
rename to docs/Samba-HOWTO-Collection/PDC.xml
diff --git a/docs/howto/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
similarity index 100%
rename from docs/howto/Passdb.xml
rename to docs/Samba-HOWTO-Collection/Passdb.xml
diff --git a/docs/howto/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
similarity index 100%
rename from docs/howto/PolicyMgmt.xml
rename to docs/Samba-HOWTO-Collection/PolicyMgmt.xml
diff --git a/docs/howto/Portability.xml b/docs/Samba-HOWTO-Collection/Portability.xml
similarity index 100%
rename from docs/howto/Portability.xml
rename to docs/Samba-HOWTO-Collection/Portability.xml
diff --git a/docs/howto/Printing.xml b/docs/Samba-HOWTO-Collection/Printing.xml
similarity index 100%
rename from docs/howto/Printing.xml
rename to docs/Samba-HOWTO-Collection/Printing.xml
diff --git a/docs/howto/Problems.xml b/docs/Samba-HOWTO-Collection/Problems.xml
similarity index 100%
rename from docs/howto/Problems.xml
rename to docs/Samba-HOWTO-Collection/Problems.xml
diff --git a/docs/howto/ProfileMgmt.xml b/docs/Samba-HOWTO-Collection/ProfileMgmt.xml
similarity index 100%
rename from docs/howto/ProfileMgmt.xml
rename to docs/Samba-HOWTO-Collection/ProfileMgmt.xml
diff --git a/docs/howto/SWAT.xml b/docs/Samba-HOWTO-Collection/SWAT.xml
similarity index 100%
rename from docs/howto/SWAT.xml
rename to docs/Samba-HOWTO-Collection/SWAT.xml
diff --git a/docs/howto/Securing.xml b/docs/Samba-HOWTO-Collection/Securing.xml
similarity index 100%
rename from docs/howto/Securing.xml
rename to docs/Samba-HOWTO-Collection/Securing.xml
diff --git a/docs/howto/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml
similarity index 100%
rename from docs/howto/ServerType.xml
rename to docs/Samba-HOWTO-Collection/ServerType.xml
diff --git a/docs/howto/Speed.xml b/docs/Samba-HOWTO-Collection/Speed.xml
similarity index 100%
rename from docs/howto/Speed.xml
rename to docs/Samba-HOWTO-Collection/Speed.xml
diff --git a/docs/howto/StandAloneServer.xml b/docs/Samba-HOWTO-Collection/StandAloneServer.xml
similarity index 100%
rename from docs/howto/StandAloneServer.xml
rename to docs/Samba-HOWTO-Collection/StandAloneServer.xml
diff --git a/docs/howto/Unicode.xml b/docs/Samba-HOWTO-Collection/Unicode.xml
similarity index 100%
rename from docs/howto/Unicode.xml
rename to docs/Samba-HOWTO-Collection/Unicode.xml
diff --git a/docs/howto/VFS.xml b/docs/Samba-HOWTO-Collection/VFS.xml
similarity index 100%
rename from docs/howto/VFS.xml
rename to docs/Samba-HOWTO-Collection/VFS.xml
diff --git a/docs/howto/Winbind.xml b/docs/Samba-HOWTO-Collection/Winbind.xml
similarity index 100%
rename from docs/howto/Winbind.xml
rename to docs/Samba-HOWTO-Collection/Winbind.xml
diff --git a/docs/howto/WindowsClientConfig.xml b/docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
similarity index 100%
rename from docs/howto/WindowsClientConfig.xml
rename to docs/Samba-HOWTO-Collection/WindowsClientConfig.xml
diff --git a/docs/howto/foreword-tridge.xml b/docs/Samba-HOWTO-Collection/foreword-tridge.xml
similarity index 100%
rename from docs/howto/foreword-tridge.xml
rename to docs/Samba-HOWTO-Collection/foreword-tridge.xml
diff --git a/docs/howto/glossary.xml b/docs/Samba-HOWTO-Collection/glossary.xml
similarity index 100%
rename from docs/howto/glossary.xml
rename to docs/Samba-HOWTO-Collection/glossary.xml
diff --git a/docs/howto/imagefiles/.cvsignore b/docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
similarity index 100%
rename from docs/howto/imagefiles/.cvsignore
rename to docs/Samba-HOWTO-Collection/imagefiles/.cvsignore
diff --git a/docs/howto/imagefiles/10small.png b/docs/Samba-HOWTO-Collection/imagefiles/10small.png
similarity index 100%
rename from docs/howto/imagefiles/10small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/10small.png
diff --git a/docs/howto/imagefiles/11small.png b/docs/Samba-HOWTO-Collection/imagefiles/11small.png
similarity index 100%
rename from docs/howto/imagefiles/11small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/11small.png
diff --git a/docs/howto/imagefiles/12small.png b/docs/Samba-HOWTO-Collection/imagefiles/12small.png
similarity index 100%
rename from docs/howto/imagefiles/12small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/12small.png
diff --git a/docs/howto/imagefiles/13small.png b/docs/Samba-HOWTO-Collection/imagefiles/13small.png
similarity index 100%
rename from docs/howto/imagefiles/13small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/13small.png
diff --git a/docs/howto/imagefiles/14small.png b/docs/Samba-HOWTO-Collection/imagefiles/14small.png
similarity index 100%
rename from docs/howto/imagefiles/14small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/14small.png
diff --git a/docs/howto/imagefiles/1small.png b/docs/Samba-HOWTO-Collection/imagefiles/1small.png
similarity index 100%
rename from docs/howto/imagefiles/1small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/1small.png
diff --git a/docs/howto/imagefiles/2small.png b/docs/Samba-HOWTO-Collection/imagefiles/2small.png
similarity index 100%
rename from docs/howto/imagefiles/2small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/2small.png
diff --git a/docs/howto/imagefiles/3small.png b/docs/Samba-HOWTO-Collection/imagefiles/3small.png
similarity index 100%
rename from docs/howto/imagefiles/3small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/3small.png
diff --git a/docs/howto/imagefiles/4small.png b/docs/Samba-HOWTO-Collection/imagefiles/4small.png
similarity index 100%
rename from docs/howto/imagefiles/4small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/4small.png
diff --git a/docs/howto/imagefiles/5small.png b/docs/Samba-HOWTO-Collection/imagefiles/5small.png
similarity index 100%
rename from docs/howto/imagefiles/5small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/5small.png
diff --git a/docs/howto/imagefiles/6small.png b/docs/Samba-HOWTO-Collection/imagefiles/6small.png
similarity index 100%
rename from docs/howto/imagefiles/6small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/6small.png
diff --git a/docs/howto/imagefiles/7small.png b/docs/Samba-HOWTO-Collection/imagefiles/7small.png
similarity index 100%
rename from docs/howto/imagefiles/7small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/7small.png
diff --git a/docs/howto/imagefiles/8small.png b/docs/Samba-HOWTO-Collection/imagefiles/8small.png
similarity index 100%
rename from docs/howto/imagefiles/8small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/8small.png
diff --git a/docs/howto/imagefiles/9small.png b/docs/Samba-HOWTO-Collection/imagefiles/9small.png
similarity index 100%
rename from docs/howto/imagefiles/9small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/9small.png
diff --git a/docs/howto/imagefiles/WME001.png b/docs/Samba-HOWTO-Collection/imagefiles/WME001.png
similarity index 100%
rename from docs/howto/imagefiles/WME001.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME001.png
diff --git a/docs/howto/imagefiles/WME002.png b/docs/Samba-HOWTO-Collection/imagefiles/WME002.png
similarity index 100%
rename from docs/howto/imagefiles/WME002.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME002.png
diff --git a/docs/howto/imagefiles/WME003.png b/docs/Samba-HOWTO-Collection/imagefiles/WME003.png
similarity index 100%
rename from docs/howto/imagefiles/WME003.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME003.png
diff --git a/docs/howto/imagefiles/WME004.png b/docs/Samba-HOWTO-Collection/imagefiles/WME004.png
similarity index 100%
rename from docs/howto/imagefiles/WME004.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME004.png
diff --git a/docs/howto/imagefiles/WME005.png b/docs/Samba-HOWTO-Collection/imagefiles/WME005.png
similarity index 100%
rename from docs/howto/imagefiles/WME005.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME005.png
diff --git a/docs/howto/imagefiles/WME006.png b/docs/Samba-HOWTO-Collection/imagefiles/WME006.png
similarity index 100%
rename from docs/howto/imagefiles/WME006.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME006.png
diff --git a/docs/howto/imagefiles/WME007.png b/docs/Samba-HOWTO-Collection/imagefiles/WME007.png
similarity index 100%
rename from docs/howto/imagefiles/WME007.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME007.png
diff --git a/docs/howto/imagefiles/WME008.png b/docs/Samba-HOWTO-Collection/imagefiles/WME008.png
similarity index 100%
rename from docs/howto/imagefiles/WME008.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME008.png
diff --git a/docs/howto/imagefiles/WME009.png b/docs/Samba-HOWTO-Collection/imagefiles/WME009.png
similarity index 100%
rename from docs/howto/imagefiles/WME009.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME009.png
diff --git a/docs/howto/imagefiles/WME010.png b/docs/Samba-HOWTO-Collection/imagefiles/WME010.png
similarity index 100%
rename from docs/howto/imagefiles/WME010.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME010.png
diff --git a/docs/howto/imagefiles/WME011.png b/docs/Samba-HOWTO-Collection/imagefiles/WME011.png
similarity index 100%
rename from docs/howto/imagefiles/WME011.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME011.png
diff --git a/docs/howto/imagefiles/WME012.png b/docs/Samba-HOWTO-Collection/imagefiles/WME012.png
similarity index 100%
rename from docs/howto/imagefiles/WME012.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME012.png
diff --git a/docs/howto/imagefiles/WME013.png b/docs/Samba-HOWTO-Collection/imagefiles/WME013.png
similarity index 100%
rename from docs/howto/imagefiles/WME013.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME013.png
diff --git a/docs/howto/imagefiles/WME014.png b/docs/Samba-HOWTO-Collection/imagefiles/WME014.png
similarity index 100%
rename from docs/howto/imagefiles/WME014.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WME014.png
diff --git a/docs/howto/imagefiles/WXPP002.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
similarity index 100%
rename from docs/howto/imagefiles/WXPP002.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WXPP002.png
diff --git a/docs/howto/imagefiles/WXPP003.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
similarity index 100%
rename from docs/howto/imagefiles/WXPP003.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WXPP003.png
diff --git a/docs/howto/imagefiles/WXPP005.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
similarity index 100%
rename from docs/howto/imagefiles/WXPP005.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WXPP005.png
diff --git a/docs/howto/imagefiles/WXPP009.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
similarity index 100%
rename from docs/howto/imagefiles/WXPP009.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WXPP009.png
diff --git a/docs/howto/imagefiles/WXPP014.png b/docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
similarity index 100%
rename from docs/howto/imagefiles/WXPP014.png
rename to docs/Samba-HOWTO-Collection/imagefiles/WXPP014.png
diff --git a/docs/howto/imagefiles/a_small.png b/docs/Samba-HOWTO-Collection/imagefiles/a_small.png
similarity index 100%
rename from docs/howto/imagefiles/a_small.png
rename to docs/Samba-HOWTO-Collection/imagefiles/a_small.png
diff --git a/docs/howto/imagefiles/access1.dia b/docs/Samba-HOWTO-Collection/imagefiles/access1.dia
similarity index 100%
rename from docs/howto/imagefiles/access1.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/access1.dia
diff --git a/docs/howto/imagefiles/access1.png b/docs/Samba-HOWTO-Collection/imagefiles/access1.png
similarity index 100%
rename from docs/howto/imagefiles/access1.png
rename to docs/Samba-HOWTO-Collection/imagefiles/access1.png
diff --git a/docs/howto/imagefiles/browsing1 b/docs/Samba-HOWTO-Collection/imagefiles/browsing1
similarity index 100%
rename from docs/howto/imagefiles/browsing1
rename to docs/Samba-HOWTO-Collection/imagefiles/browsing1
diff --git a/docs/howto/imagefiles/browsing1.png b/docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
similarity index 100%
rename from docs/howto/imagefiles/browsing1.png
rename to docs/Samba-HOWTO-Collection/imagefiles/browsing1.png
diff --git a/docs/howto/imagefiles/cups1.dia b/docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
similarity index 100%
rename from docs/howto/imagefiles/cups1.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/cups1.dia
diff --git a/docs/howto/imagefiles/cups1.png b/docs/Samba-HOWTO-Collection/imagefiles/cups1.png
similarity index 100%
rename from docs/howto/imagefiles/cups1.png
rename to docs/Samba-HOWTO-Collection/imagefiles/cups1.png
diff --git a/docs/howto/imagefiles/cups2.dia b/docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
similarity index 100%
rename from docs/howto/imagefiles/cups2.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/cups2.dia
diff --git a/docs/howto/imagefiles/cups2.png b/docs/Samba-HOWTO-Collection/imagefiles/cups2.png
similarity index 100%
rename from docs/howto/imagefiles/cups2.png
rename to docs/Samba-HOWTO-Collection/imagefiles/cups2.png
diff --git a/docs/howto/imagefiles/domain.dia b/docs/Samba-HOWTO-Collection/imagefiles/domain.dia
similarity index 100%
rename from docs/howto/imagefiles/domain.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/domain.dia
diff --git a/docs/howto/imagefiles/domain.png b/docs/Samba-HOWTO-Collection/imagefiles/domain.png
similarity index 100%
rename from docs/howto/imagefiles/domain.png
rename to docs/Samba-HOWTO-Collection/imagefiles/domain.png
diff --git a/docs/howto/imagefiles/ethereal1.png b/docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
similarity index 100%
rename from docs/howto/imagefiles/ethereal1.png
rename to docs/Samba-HOWTO-Collection/imagefiles/ethereal1.png
diff --git a/docs/howto/imagefiles/ethereal2.png b/docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
similarity index 100%
rename from docs/howto/imagefiles/ethereal2.png
rename to docs/Samba-HOWTO-Collection/imagefiles/ethereal2.png
diff --git a/docs/howto/imagefiles/idmap-gid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-gid2sid.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-gid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-gid2sid.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
diff --git a/docs/howto/imagefiles/idmap-groups.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-groups.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
diff --git a/docs/howto/imagefiles/idmap-groups.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-groups.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-groups.png
diff --git a/docs/howto/imagefiles/idmap-sid2gid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-sid2gid.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
diff --git a/docs/howto/imagefiles/idmap-sid2gid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-sid2gid.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
diff --git a/docs/howto/imagefiles/idmap-sid2uid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-sid2uid.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
diff --git a/docs/howto/imagefiles/idmap-sid2uid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-sid2uid.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
diff --git a/docs/howto/imagefiles/idmap-store-gid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-store-gid2sid.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-store-gid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-store-gid2sid.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
diff --git a/docs/howto/imagefiles/idmap-uid2sid.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap-uid2sid.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
diff --git a/docs/howto/imagefiles/idmap-uid2sid.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
similarity index 100%
rename from docs/howto/imagefiles/idmap-uid2sid.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
diff --git a/docs/howto/imagefiles/idmap.dia b/docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
similarity index 100%
rename from docs/howto/imagefiles/idmap.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap.dia
diff --git a/docs/howto/imagefiles/idmap.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap.png
similarity index 100%
rename from docs/howto/imagefiles/idmap.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap.png
diff --git a/docs/howto/imagefiles/idmap_winbind_no_loop.png b/docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
similarity index 100%
rename from docs/howto/imagefiles/idmap_winbind_no_loop.png
rename to docs/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
diff --git a/docs/howto/imagefiles/pdftoepsonusb.dia b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
similarity index 100%
rename from docs/howto/imagefiles/pdftoepsonusb.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
diff --git a/docs/howto/imagefiles/pdftoepsonusb.png b/docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
similarity index 100%
rename from docs/howto/imagefiles/pdftoepsonusb.png
rename to docs/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
diff --git a/docs/howto/imagefiles/pdftosocket.dia b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
similarity index 100%
rename from docs/howto/imagefiles/pdftosocket.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
diff --git a/docs/howto/imagefiles/pdftosocket.png b/docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
similarity index 100%
rename from docs/howto/imagefiles/pdftosocket.png
rename to docs/Samba-HOWTO-Collection/imagefiles/pdftosocket.png
diff --git a/docs/howto/imagefiles/trusts1.dia b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
similarity index 100%
rename from docs/howto/imagefiles/trusts1.dia
rename to docs/Samba-HOWTO-Collection/imagefiles/trusts1.dia
diff --git a/docs/howto/imagefiles/trusts1.png b/docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
similarity index 100%
rename from docs/howto/imagefiles/trusts1.png
rename to docs/Samba-HOWTO-Collection/imagefiles/trusts1.png
diff --git a/docs/howto/imagefiles/w2kp001.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp001.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp001.png
diff --git a/docs/howto/imagefiles/w2kp002.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp002.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp002.png
diff --git a/docs/howto/imagefiles/w2kp003.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp003.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp003.png
diff --git a/docs/howto/imagefiles/w2kp004.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp004.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp004.png
diff --git a/docs/howto/imagefiles/w2kp005.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp005.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp005.png
diff --git a/docs/howto/imagefiles/w2kp006.png b/docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
similarity index 100%
rename from docs/howto/imagefiles/w2kp006.png
rename to docs/Samba-HOWTO-Collection/imagefiles/w2kp006.png
diff --git a/docs/howto/imagefiles/wxpp001.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp001.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp001.png
diff --git a/docs/howto/imagefiles/wxpp004.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp004.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp004.png
diff --git a/docs/howto/imagefiles/wxpp006.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp006.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp006.png
diff --git a/docs/howto/imagefiles/wxpp007.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp007.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp007.png
diff --git a/docs/howto/imagefiles/wxpp008.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp008.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp008.png
diff --git a/docs/howto/imagefiles/wxpp010.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp010.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp010.png
diff --git a/docs/howto/imagefiles/wxpp011.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp011.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp011.png
diff --git a/docs/howto/imagefiles/wxpp012.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp012.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp012.png
diff --git a/docs/howto/imagefiles/wxpp013.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp013.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp013.png
diff --git a/docs/howto/imagefiles/wxpp015.png b/docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
similarity index 100%
rename from docs/howto/imagefiles/wxpp015.png
rename to docs/Samba-HOWTO-Collection/imagefiles/wxpp015.png
diff --git a/docs/howto/index.xml b/docs/Samba-HOWTO-Collection/index.xml
similarity index 98%
rename from docs/howto/index.xml
rename to docs/Samba-HOWTO-Collection/index.xml
index 5bdc64d702d..a04e692ccd2 100644
--- a/docs/howto/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -20,12 +20,7 @@
 
 <?latex \setcounter{page}{5} ?>
 
-<preface>
-	<title>Attribution</title>
-	<para>
-		<xi:include href="attributions.xml"/>
-	</para>
-</preface>
+<xi:include href="../Samba-HOWTO-Collection-attributions.xml"/>
 
 <?latex \cleardoublepage ?>
 
diff --git a/docs/howto/locking.xml b/docs/Samba-HOWTO-Collection/locking.xml
similarity index 100%
rename from docs/howto/locking.xml
rename to docs/Samba-HOWTO-Collection/locking.xml
diff --git a/docs/howto/msdfs.xml b/docs/Samba-HOWTO-Collection/msdfs.xml
similarity index 100%
rename from docs/howto/msdfs.xml
rename to docs/Samba-HOWTO-Collection/msdfs.xml
diff --git a/docs/howto/upgrading-to-3.0.xml b/docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
similarity index 100%
rename from docs/howto/upgrading-to-3.0.xml
rename to docs/Samba-HOWTO-Collection/upgrading-to-3.0.xml
diff --git a/docs/htmldocs.html b/docs/htmldocs.html
index 8c15af35bc5..9f6eef673b6 100644
--- a/docs/htmldocs.html
+++ b/docs/htmldocs.html
@@ -11,15 +11,15 @@
 </div>
 <hr>
 <table>
- <td valign="top">SAMBA <a href="devel/index.html">Developers</a> Guide</td>
+ <td valign="top">SAMBA <a href="Samba-Developers-Guide/index.html">Developers</a> Guide</td>
  <td valign="top">This book is a collection of documents that might be useful for people developing samba or those interested in doing so. It's nothing more than a collection of documents written by samba developers about the internals of various parts of samba and the SMB protocol. It's still (and will always be) incomplete.</td>
 </tr>
 <tr>
- <td valign="top">Samba-3 by <a href="guide/index.html">Examples</a></td>
+<td valign="top">Samba-3 by <a href="Samba-Guide/index.html">Example</a></td>
  <td valign="top">Practical Exercises in Successful Samba Deployment.</td>
 </tr>
 <tr>
- <td valign="top">The Official Samba-3 <a href="howto/index.html">HOWTO</a> and Reference Guide</td>
+ <td valign="top">The Official Samba-3 <a href="Samba-HOWTO-Collection/index.html">HOWTO</a> and Reference Guide</td>
  <td valign="top">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.</td>
 </tr>
 <tr>
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index dfdc2401808..8d132a99359 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -239,7 +239,7 @@
 					<xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
 					<xsl:element name="imagedata">
 						<xsl:attribute name="fileref">
-							<xsl:text>howto/imagefiles/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
+							<xsl:value-of select="$imagedir"/><xsl:value-of select="imagefile"/></xsl:attribute>
 						<xsl:attribute name="scale">
 							<xsl:choose>
 								<xsl:when test="@scale != ''">
diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl
index dd9af2a2f3f..fa34f3bbe22 100644
--- a/docs/xslt/generate-attributions.xsl
+++ b/docs/xslt/generate-attributions.xsl
@@ -13,6 +13,15 @@
    <xsl:apply-templates select="@*|node()"/>
 </xsl:template>
 
+<xsl:template match="/">
+	<xsl:element name="preface">
+		<xsl:element name="title"><xsl:text>Attribution</xsl:text></xsl:element>
+		<xsl:element name="para">
+			<xsl:apply-templates/>
+		</xsl:element>
+	</xsl:element>
+</xsl:template>
+
 <xsl:template match="chapter">
 	<xsl:choose>
 		<xsl:when test="chapterinfo/author != ''">
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index 8cc6b0d5469..f969f86ae23 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -12,7 +12,7 @@
 <xsl:variable name="latex.documentclass.book"></xsl:variable>
 <xsl:variable name="latex.hyperref.param.pdftex">hyperfigures,hyperindex,citecolor=black,urlcolor=black,filecolor=black,linkcolor=black,menucolor=red,pagecolor=black</xsl:variable>
 <xsl:variable name="latex.document.font">default</xsl:variable>
-<xsl:variable name="latex.admonition.path">xslt/figures</xsl:variable>
+<xsl:variable name="admon.graphics.path">xslt/figures</xsl:variable>
 <xsl:variable name="latex.use.tabularx">1</xsl:variable>
 <xsl:variable name="latex.fancyhdr.lh"></xsl:variable>
 <xsl:variable name="latex.use.fancyhdr"></xsl:variable>