diff options
Diffstat (limited to 'docs')
27 files changed, 39 insertions, 34 deletions
diff --git a/docs/Makefile b/docs/Makefile index 39ca5f38a6..8be60d90e5 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -65,7 +65,7 @@ htmlman: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/%.html,$(MANPAGES)) $(HTMLDIR 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)) -validate: $(patsubst $(DOCBOOKDIR)/%.xml,$(VALIDATEDIR)/%.report,$(MAIN_DOCS)) +validate: $(patsubst $(DOCBOOKDIR)/%.xml,%-validate,$(MAIN_DOCS)) # Intermediate docbook docs @@ -225,9 +225,8 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml -$(XMLLINT) --valid --noout $< 2> $@ # Validation verification -$(VALIDATEDIR)/%.report: %/index.xml - mkdir -p $(@D) - -$(XMLLINT) --xinclude --postvalid --noout $< 2> $@ +%-validate: %/index.xml + -$(XMLLINT) --xinclude --noent --postvalid --noout $< # Find undocumented parameters undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in index f4a3dca2b4..8d210e7121 100644 --- a/docs/Makefile.settings.in +++ b/docs/Makefile.settings.in @@ -41,7 +41,6 @@ PDFDIR = $(OUTPUTDIR) DVIDIR = $(OUTPUTDIR) FODIR = $(OUTPUTDIR) HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp -VALIDATEDIR = $(OUTPUTDIR)/validate PEARSONDIR = $(OUTPUTDIR)/pearson TXTDIR = $(OUTPUTDIR)/textdocs HTMLDIR=$(OUTPUTDIR)/htmldocs diff --git a/docs/Samba-Developers-Guide/CodingSuggestions.xml b/docs/Samba-Developers-Guide/CodingSuggestions.xml index 09d842639e..caf93d84ad 100644 --- a/docs/Samba-Developers-Guide/CodingSuggestions.xml +++ b/docs/Samba-Developers-Guide/CodingSuggestions.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="CodingSuggestions"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/NetBIOS.xml b/docs/Samba-Developers-Guide/NetBIOS.xml index d1fdd21737..04eaecd4ab 100644 --- a/docs/Samba-Developers-Guide/NetBIOS.xml +++ b/docs/Samba-Developers-Guide/NetBIOS.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="netbios"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/Tracing.xml b/docs/Samba-Developers-Guide/Tracing.xml index 7586f3c4c5..3eaab6373e 100644 --- a/docs/Samba-Developers-Guide/Tracing.xml +++ b/docs/Samba-Developers-Guide/Tracing.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="tracing"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/architecture.xml b/docs/Samba-Developers-Guide/architecture.xml index da276ca91e..bb0f29981b 100644 --- a/docs/Samba-Developers-Guide/architecture.xml +++ b/docs/Samba-Developers-Guide/architecture.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="architecture"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/cifsntdomain.xml b/docs/Samba-Developers-Guide/cifsntdomain.xml index fd19205ada..2626c8fc13 100644 --- a/docs/Samba-Developers-Guide/cifsntdomain.xml +++ b/docs/Samba-Developers-Guide/cifsntdomain.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="ntdomain"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/contributing.xml b/docs/Samba-Developers-Guide/contributing.xml index acb8085cbe..01e6fb2863 100644 --- a/docs/Samba-Developers-Guide/contributing.xml +++ b/docs/Samba-Developers-Guide/contributing.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> + <chapter id="contributing"> <chapterinfo> &author.jelmer; diff --git a/docs/Samba-Developers-Guide/debug.xml b/docs/Samba-Developers-Guide/debug.xml index 5ffc0cbc74..a55facedff 100644 --- a/docs/Samba-Developers-Guide/debug.xml +++ b/docs/Samba-Developers-Guide/debug.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="debug"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/encryption.xml b/docs/Samba-Developers-Guide/encryption.xml index 5ab711014b..be00beba5d 100644 --- a/docs/Samba-Developers-Guide/encryption.xml +++ b/docs/Samba-Developers-Guide/encryption.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="pwencrypt"> diff --git a/docs/Samba-Developers-Guide/gencache.xml b/docs/Samba-Developers-Guide/gencache.xml index 7def6f21d2..7e8475c192 100644 --- a/docs/Samba-Developers-Guide/gencache.xml +++ b/docs/Samba-Developers-Guide/gencache.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="gencache"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/index.xml b/docs/Samba-Developers-Guide/index.xml index 9d3cc9aea7..c02e30fdce 100644 --- a/docs/Samba-Developers-Guide/index.xml +++ b/docs/Samba-Developers-Guide/index.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc" [ +<!ATTLIST book + xmlns:xi CDATA #FIXED "http://www.w3.org/2003/XInclude"> +]> <book id="Samba-Developers-Guide" xmlns:xi="http://www.w3.org/2003/XInclude"> diff --git a/docs/Samba-Developers-Guide/internals.xml b/docs/Samba-Developers-Guide/internals.xml index a6d6435ac7..6178028600 100644 --- a/docs/Samba-Developers-Guide/internals.xml +++ b/docs/Samba-Developers-Guide/internals.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="internals"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/modules.xml b/docs/Samba-Developers-Guide/modules.xml index 30768e47ed..a74c176844 100644 --- a/docs/Samba-Developers-Guide/modules.xml +++ b/docs/Samba-Developers-Guide/modules.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="modules"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/packagers.xml b/docs/Samba-Developers-Guide/packagers.xml index 470e1e8288..5c834b09fe 100644 --- a/docs/Samba-Developers-Guide/packagers.xml +++ b/docs/Samba-Developers-Guide/packagers.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="Packaging"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/parsing.xml b/docs/Samba-Developers-Guide/parsing.xml index 1b3df637cd..d695f9313c 100644 --- a/docs/Samba-Developers-Guide/parsing.xml +++ b/docs/Samba-Developers-Guide/parsing.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="parsing"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/printing.xml b/docs/Samba-Developers-Guide/printing.xml index d41bc22ddf..fc0a1ee4b7 100644 --- a/docs/Samba-Developers-Guide/printing.xml +++ b/docs/Samba-Developers-Guide/printing.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="printing"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/registry.xml b/docs/Samba-Developers-Guide/registry.xml index 62925c62f4..bc394d71b7 100644 --- a/docs/Samba-Developers-Guide/registry.xml +++ b/docs/Samba-Developers-Guide/registry.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="registry"> <chapterinfo> &author.jelmer; diff --git a/docs/Samba-Developers-Guide/rpc_plugin.xml b/docs/Samba-Developers-Guide/rpc_plugin.xml index dc91129f38..cc263ffc3e 100644 --- a/docs/Samba-Developers-Guide/rpc_plugin.xml +++ b/docs/Samba-Developers-Guide/rpc_plugin.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="rpc-plugin"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/unix-smb.xml b/docs/Samba-Developers-Guide/unix-smb.xml index 3c63c74dfd..b700dfc9dc 100644 --- a/docs/Samba-Developers-Guide/unix-smb.xml +++ b/docs/Samba-Developers-Guide/unix-smb.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="unix-smb"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/vfs.xml b/docs/Samba-Developers-Guide/vfs.xml index 652bc61eb9..25a45b6875 100644 --- a/docs/Samba-Developers-Guide/vfs.xml +++ b/docs/Samba-Developers-Guide/vfs.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="vfs"> <chapterinfo> <author> diff --git a/docs/Samba-Developers-Guide/windows-debug.xml b/docs/Samba-Developers-Guide/windows-debug.xml index e04ccd3797..db0560c6e1 100644 --- a/docs/Samba-Developers-Guide/windows-debug.xml +++ b/docs/Samba-Developers-Guide/windows-debug.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="windows-debug"> <chapterinfo> &author.jelmer; diff --git a/docs/Samba-Developers-Guide/wins.xml b/docs/Samba-Developers-Guide/wins.xml index 7793160b03..df29627bfd 100644 --- a/docs/Samba-Developers-Guide/wins.xml +++ b/docs/Samba-Developers-Guide/wins.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE book PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> +<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> <chapter id="wins"> <chapterinfo> <author> diff --git a/docs/Samba-HOWTO-Collection/Group-Mapping.xml b/docs/Samba-HOWTO-Collection/Group-Mapping.xml index c09d9e860b..7f4495cd5a 100644 --- a/docs/Samba-HOWTO-Collection/Group-Mapping.xml +++ b/docs/Samba-HOWTO-Collection/Group-Mapping.xml @@ -57,11 +57,12 @@ </para> <image id="idmap-sid2gid"> - <description>IDMAP: group SID to GID resolution.</description> + <imagedescription>IDMAP: group SID to GID resolution.</imagedescription> <imagefile scale="50">idmap-sid2gid</imagefile> </image> - <image id="idmap-gid2sid"><description>IDMAP: GID resolution to matching SID.</description> + <image id="idmap-gid2sid"> + <imagedescription>IDMAP: GID resolution to matching SID.</imagedescription> <imagefile scale="50">idmap-gid2sid</imagefile> </image> @@ -73,8 +74,9 @@ used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>. </para> - <image id="idmap-store-gid2sid"><description>IDMAP storing group mappings.</description> - <imagefile scale="50">idmap-store-gid2sid</imagefile> + <image id="idmap-store-gid2sid"> + <imagedescription>IDMAP storing group mappings.</imagedescription> + <imagefile scale="50">idmap-store-gid2sid</imagefile> </image> <para> diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml index 2e25646822..e512270460 100644 --- a/docs/Samba-HOWTO-Collection/PDC.xml +++ b/docs/Samba-HOWTO-Collection/PDC.xml @@ -33,8 +33,9 @@ network environment. Workstations A, B and C are representative of many physical network clients. </para> -<image id="domain-example"><description>An Example Domain.</description> -<imagefile scale="50">domain</imagefile> +<image id="domain-example"> + <imagedescription>An Example Domain.</imagedescription> + <imagefile scale="50">domain</imagefile> </image> <?latex \newpage ?> diff --git a/docs/smbdotconf/base/interfaces.xml b/docs/smbdotconf/base/interfaces.xml index f2ccfe36ad..1a3af3bb23 100644 --- a/docs/smbdotconf/base/interfaces.xml +++ b/docs/smbdotconf/base/interfaces.xml @@ -36,6 +36,7 @@ the OS's normal hostname resolution mechanisms.</para> </description> +<related>bind interfaces only</related> <value type="example"> <comment>This would configure three network interfaces corresponding @@ -44,6 +45,5 @@ eth0 192.168.2.10/24 192.168.3.10/255.255.255.0 </value> -<related>bind interfaces only</related> <value type="default"><comment>all active interfaces except 127.0.0.1 that are broadcast capable</comment></value> </samba:parameter> diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl index a6e7f98e16..fed7325c9b 100644 --- a/docs/xslt/generate-attributions.xsl +++ b/docs/xslt/generate-attributions.xsl @@ -6,7 +6,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.1"> -<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/> + <xsl:output method="xml" doctype-public="-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" doctype-system="http://www.samba.org/samba/DTD/samba-doc" omit-xml-declaration="yes" indent="yes"/> <!-- Remove all character data --> <xsl:template match="@*|node()"> |