Update DTD location. Fixes smb.conf.5 build.

diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in
index 8d210e712169d8c6500ce8de6bf29116f4299df5..20d00e74b2577fa33abd7a9df95f5d6ffc9fac68 100644 (file)
--- a/docs/Makefile.settings.in
+++ b/docs/Makefile.settings.in
@@ -32,7 +32,7 @@ MANDIR = $(OUTPUTDIR)/manpages
 EPSTOPDF = @EPSTOPDF@
 MANPAGEDIR = manpages
 MAKEINDEX = @MAKEINDEX@
-EXAMPLESDIR = examples
+EXAMPLESDIR = $(OUTPUTDIR)/examples
 SMBDOTCONFDOC = smbdotconf
 DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)

diff --git a/docs/settings.xsl.in b/docs/settings.xsl.in
index ef075ee854587ef574bbdac3367e8e89d36e442b..52f48a65e2c0b37db2c361b678373276c55ccf7b 100644 (file)
--- a/docs/settings.xsl.in
+++ b/docs/settings.xsl.in
@@ -1,7 +1,5 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:samba="http://samba.org/common"
                                version="1.1">
 
 <xsl:param name="papersize"><xsl:text>@PAPERSIZE@</xsl:text></xsl:param>

diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index aa7d54c0f77d77b6ab4954b3ee0a2a27723f9c7a..6633f3488778644ff307dab0e12fed98769cb8b9 100644 (file)
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -7,15 +7,13 @@
        (C) Alexander Bokovoy                                   2002-2004
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-       xmlns:samba="http://samba.org/common"
+       xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
        version="1.1">
 
        <xsl:import href="../settings.xsl"/>
 
        <xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
 
-       <xsl:param name="xmlSambaNsUri" select="'http://samba.org/common'"/>
-
        <xsl:template match="reference/refentry/refsect1">
                <xsl:if test="title!='VERSION' and title!='AUTHOR'">
                        <xsl:element name="refsect1">

diff --git a/docs/xslt/extract-examples.xsl b/docs/xslt/extract-examples.xsl
index d99bee5f11dbd860924ced8db9009395f0e32096..fc90addecc289371a09fe7b930e9aac6f39f7696 100644 (file)
--- a/docs/xslt/extract-examples.xsl
+++ b/docs/xslt/extract-examples.xsl
@@ -5,7 +5,7 @@ Extract examples out of DocBook/XML file
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
-                xmlns:samba="http://samba.org/common"
+                               xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
                version="1.1"
                 extension-element-prefixes="exsl">
 

diff --git a/docs/xslt/extract-smbfiles.xsl b/docs/xslt/extract-smbfiles.xsl
index 88ca50ec3308caeac8f5a840745a236407c0d9be..997320de4af457f56f3f77d815f11fc1e0e6caf0 100644 (file)
--- a/docs/xslt/extract-smbfiles.xsl
+++ b/docs/xslt/extract-smbfiles.xsl
@@ -2,7 +2,7 @@
 <!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
-                xmlns:samba="http://samba.org/common"
+                               xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
                version="1.1"
                 extension-element-prefixes="exsl">
 

diff --git a/docs/xslt/pretty-format.xsl b/docs/xslt/pretty-format.xsl
index 193737dc2a1edeba603ae8a01e77f20b65ae3377..6b12f9a048209eaf4c1afbb3cf351a6e12874f9a 100644 (file)
--- a/docs/xslt/pretty-format.xsl
+++ b/docs/xslt/pretty-format.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-       xmlns:samba="http://samba.org/common"
+       xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
        version="1.1">
        
        <xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>

diff --git a/docs/xslt/smb.conf-html.xsl b/docs/xslt/smb.conf-html.xsl
index 1458f63355f2f98dcd6f63588c5130e638f4423f..dd28553d4feaa94a5d5f0a68406f231af5f7cf55 100644 (file)
--- a/docs/xslt/smb.conf-html.xsl
+++ b/docs/xslt/smb.conf-html.xsl
@@ -7,7 +7,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
        xmlns:exsl="http://exslt.org/common"
-       xmlns:samba="http://samba.org/common"
+       xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
        version="1.1"
        extension-element-prefixes="exsl">