New structure for the docs:
authorJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jun 2004 12:43:16 +0000 (12:43 +0000)
committerGerald W. Carter <jerry@samba.org>
Wed, 23 Apr 2008 13:59:00 +0000 (08:59 -0500)
 - 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

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

index 7bd60d7886efc2fd88742300ee18296004512c7b..f675dd61ea0779ccb5c75bd38bc9eb82986f066f 100644 (file)
@@ -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))
+
+Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
+Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png)
 
-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_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
-
-pdf: $(PDFDIR) $(PDFDIR)/Samba-HOWTO-Collection.pdf $(PDFDIR)/Samba-Developers-Guide.pdf
-
-dvi: $(DVIDIR) $(DVIDIR)/Samba-HOWTO-Collection.dvi $(DVIDIR)/Samba-Developers-Guide.dvi
-
-ps: $(PSDIR) $(PSDIR)/Samba-HOWTO-Collection.ps $(PSDIR)/Samba-Developers-Guide.ps
+# 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))
 
-txt: $(TXTDIR) $(TXTDIR)/Samba-HOWTO-Collection.txt $(TXTDIR)/Samba-Developers-Guide.txt
+# Intermediate docbook docs
 
-fo: $(FODIR) $(FODIR)/Samba-HOWTO-Collection.fo $(FODIR)/Samba-Developers-Guide.fo
+$(DOCBOOKDIR):
+       mkdir $@
 
-htmlman: $(HTMLDIR) $(MANPAGES_HTML) $(HTMLDIR)/samba.css
+$(DOCBOOKDIR)/%.xml: %/index.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+       $(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-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/
+$(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml $(DOCBOOKDIR) xslt/expand-sambadoc.xsl
+       $(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
-html: $(HTMLDIR)/howto $(HTMLDIR)/guide $(HTMLDIR)/devel $(HTMLDIR)/index.html
+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>" >> $@
 
-htmlhelp: $(HTMLHELPDIR)/Samba-HOWTO-Collection $(HTMLHELPDIR)/Samba-Developers-Guide $(HTMLHELPDIR)/Samba-Guide
+# HTML docs
 
 $(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)
-       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
+$(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
 
-plucker: html-single htmlman $(PLUCKERDIR) $(MANPAGES_PLUCKER) $(PLUCKERDIR)/Samba-Developers-Guide.pdb $(PLUCKERDIR)/Samba-HOWTO-Collection.pdb
+# Single large HTML files
+$(HTMLDIR):
+       mkdir $(HTMLDIR)
+       mkdir $(HTMLDIR)/images
 
-Samba-HOWTO-Collection.xml: $(HOWTODIR)/index.xml $(HOWTODIR_DEPS)
-       $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
+       cp $< $@
 
-Samba-Guide.xml: $(GUIDEDOC)/guide-main.xml
-       $(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 $<
 
-Samba-Developers-Guide.xml: $(DEVDOCDIR)/index.xml $(DEVDOCDIR_DEPS)
-       $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+$(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLDIR)/%,$(MAIN_DOCS)): $(HTMLDIR)
+       -mkdir $@
 
-%/attributions.xml: %/index.xml
-       @echo "<empty/>" > $@ # Make sure we don't get recursive dependencies, etc!
-       $(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+%-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:
similarity index 96%
rename from docs/devel/gencache.xml
rename to docs/Samba-Developers-Guide/gencache.xml
index 265461c5e3853922ac0c83bdd32bb33553383df0..94184bf865e877341dad8d8036a774cdc49716ad 100644 (file)
@@ -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>
similarity index 96%
rename from docs/devel/index.xml
rename to docs/Samba-Developers-Guide/index.xml
index 30e18b20ba3397469b7d671024e081d18465eea1..dfbe726a1314274ad6cca61fb88ce0833e922b69 100644 (file)
@@ -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/>
similarity index 93%
rename from docs/guide/Chap01-WindowsNetworkingPrimer.xml
rename to docs/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index 893a7629ee91ad140ed4deec899ab21f092e66b4..d677e4cba3697163545aedc45f9ead0910c1412f 100644 (file)
                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>
-
-<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="pktcap01">
+                       <imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
+                       <description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+               </image>
+
+               <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>
 
                </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>
 
                <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>
                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>
 
        </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>
-
-<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="XPCap01">
+        <description>Typical Windows XP NULL Session Setup AndX Request</description>
+               <imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+       </image>
+
+       <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>
similarity index 98%
rename from docs/guide/Chap02-SimpleOfficeServer.xml
rename to docs/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 52e27bd6ce083828d6aee3c2c944b6836cba6fa1..4e42b52039410c0912359e405a53713bdc59cad4 100644 (file)
                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>
similarity index 99%
rename from docs/guide/Chap03-TheSmallOffice.xml
rename to docs/Samba-Guide/Chap03-TheSmallOffice.xml
index e50af189f1ab8a89dedded4d75068ed4090a1e74..f874a8b6788ca8537d783719aefe187f75e9e785 100644 (file)
        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>
similarity index 99%
rename from docs/guide/Chap04-SecureOfficeServer.xml
rename to docs/Samba-Guide/Chap04-SecureOfficeServer.xml
index fb375187a64212d8a01481b9e31cb30fd322fdd2..5ec4ab2166f7d6d983b0ee07a714906005491610 100644 (file)
                        </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
similarity index 99%
rename from docs/guide/Chap05-500UserNetwork.xml
rename to docs/Samba-Guide/Chap05-500UserNetwork.xml
index 435d6cea46dce2b971beaf56fd4d61638e8d0dcd..3c679c1b095655bc3582c912d8f3d3ae65fff60a 100644 (file)
        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>
similarity index 99%
rename from docs/guide/Chap06-MakingHappyUsers.xml
rename to docs/Samba-Guide/Chap06-MakingHappyUsers.xml
index b80bd2eed23494db76c746aa977b541cadad61c9..c8a547ac679606ba716acc63a5cebc50c446ed3f 100644 (file)
        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>
        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>
similarity index 96%
rename from docs/guide/Chap07-2000UserNetwork.xml
rename to docs/Samba-Guide/Chap07-2000UserNetwork.xml
index a8f7b91e2d307af0d7716668b31a02591f689fcc..73134cf1085080be3fecd84c56b8fa7fe95eaeec 100644 (file)
            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>
-
-<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="chap7net">
+               <description>Network Topology &smbmdash; 2000 User Complex Design A</description>
+               <imagefile scale="80">chap7-net-Ar.png</imagefile>
+       </image>
+
+       <image id="chap7net2">
+               <description>Network Topology &smbmdash; 2000 User Complex Design B</description>
+               <imagefile scale="80">chap7-net2-Br.png</imagefile>
+       </image>
 
        </sect3>
 
        (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
similarity index 98%
rename from docs/guide/Chap08-MigrateNT4Samba3.xml
rename to docs/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index 29f25a77643008747054585001fc859680732e4a..a6b196f36511cfade8fe9fa79eb1fc809810eded 100644 (file)
                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:
                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>
 
similarity index 98%
rename from docs/guide/Chap09-AddingUNIXClients.xml
rename to docs/Samba-Guide/Chap09-AddingUNIXClients.xml
index 837209413867b92aee86e39cf6c7ed258112f701..e46fc22396f884a2f9be8999bc06ec84c14e742c 100644 (file)
        <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
        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>
similarity index 96%
rename from docs/guide/Chap12-Appendix.xml
rename to docs/Samba-Guide/Chap12-Appendix.xml
index 6b6550dc2ee52b4c37edfac4fb1aeda70252974a..c3b244c405d92b442b6ed104f1b80c7d3adddf29 100644 (file)
@@ -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>
-
-       <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">
+               <description>The LDAP Account Manager Group Edit Screen</description>
+               <imagefile scale="50">lam-groups.png</imagefile>
+       </image>
+
+       <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
similarity index 100%
rename from docs/guide/gpl.xml
rename to docs/Samba-Guide/gpl.xml
similarity index 94%
rename from docs/howto/Further-Resources.xml
rename to docs/Samba-HOWTO-Collection/Further-Resources.xml
index 549e0ff6a677d19d1c4deba41bb48114335ba6c1..8ca95442be6bb5b3f3b812e45ad4c0ebc9a6f7d8 100644 (file)
@@ -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;
similarity index 98%
rename from docs/howto/index.xml
rename to docs/Samba-HOWTO-Collection/index.xml
index 5bdc64d702dbdc8cdbdc4f1f5c0e6114ad8e9b1d..a04e692ccd2538551fad3172da138b0dfe374c36 100644 (file)
 
 <?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 ?>
 
index 8c15af35bc5417988baf5e2a39c32ef67af0ab7b..9f6eef673b62b97a04f361a66a945e7717cd5ad0 100644 (file)
 </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>
index dfdc2401808f3ab0c6209b893215ab0e898b95e6..8d132a99359ed6b5ffeda5c8fb624944666c77ec 100644 (file)
                                        <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 != ''">
index dd9af2a2f3fbed91f7419217414cabf73b2e61df..fa34f3bbe227a17139c4a3c18456f2eee049996b 100644 (file)
    <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 != ''">
index 8cc6b0d5469e22c77fcd3afddc7ef2314b578631..f969f86ae237c8368ece0b616666cc32cf6e9888 100644 (file)
@@ -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>