7 files changed, 6 insertions, 10 deletions
diff --git a/docs/Makefile.settings.in b/docs/Makefile.settings.in
index 8d210e7121..20d00e74b2 100644
--- 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 ef075ee854..52f48a65e2 100644
--- 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 aa7d54c0f7..6633f34887 100644
--- 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 d99bee5f11..fc90addecc 100644
--- 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 88ca50ec33..997320de4a 100644
--- 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 193737dc2a..6b12f9a048 100644
--- 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 1458f63355..dd28553d4f 100644
--- 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">