From 5dee225836413562c0717932acfee8b9348048c8 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Thu, 26 May 2011 17:40:26 +0100
Subject: What on earth were those namespaces imported for? They're not used
 for anything, and they help the build to fail if we can't contact
 docbook.org.

---
 docs/usage.xsl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/usage.xsl b/docs/usage.xsl
index a6cebd93..586f8303 100644
--- a/docs/usage.xsl
+++ b/docs/usage.xsl
@@ -1,9 +1,5 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                exclude-result-prefixes="exsl"
                 version='1.0'>
 
 <xsl:param name="modulename"/>
-- 
cgit v1.2.1


From ba598037cc46d056276a19c6b5d8acf3c103e790 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Thu, 26 May 2011 18:04:00 +0100
Subject: Don't validate against the docbook DTD when building the usage erl -
 we don't need docbook installed to build the server, but without this
 --novalid we instead go to the internet if docbook is not installed, which
 can make building flaky.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e376b4ac..a27d3138 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,7 @@ distclean: clean
 # Do not fold the cp into previous line, it's there to stop the file being
 # generated but empty if we fail
 $(SOURCE_DIR)/%_usage.erl:
-	xsltproc --stringparam modulename "`basename $@ .erl`" \
+	xsltproc --novalid --stringparam modulename "`basename $@ .erl`" \
 		$(DOCS_DIR)/usage.xsl $< > $@.tmp
 	sed -e 's/"/\\"/g' -e 's/%QUOTE%/"/g' $@.tmp > $@.tmp2
 	fold -s $@.tmp2 > $@.tmp3
-- 
cgit v1.2.1


From 2d38bce657b47c4081c60a2c29f1e0b756f61ac9 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Tue, 31 May 2011 11:04:05 +0100
Subject: Remove more pointless namespaces.

---
 docs/examples-to-end.xsl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/examples-to-end.xsl b/docs/examples-to-end.xsl
index d9686ada..a0a74178 100644
--- a/docs/examples-to-end.xsl
+++ b/docs/examples-to-end.xsl
@@ -1,9 +1,5 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                exclude-result-prefixes="exsl ng db"
                 version='1.0'>
 
 <xsl:output doctype-public="-//OASIS//DTD DocBook XML V4.5//EN" doctype-system="http://www.docbook.org/xml/4.5/docbookx.dtd" />
-- 
cgit v1.2.1


From 03e22bf0d868d03974edeafb18d3bda22074e7eb Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Tue, 31 May 2011 11:08:01 +0100
Subject: These "--novalid"s are less meaningful in the context of bug 24137
 since you need to have docbook installed to get this far and so can't trigger
 the bug. But it can't harm to put them in, and it's possible that there's
 some other bug I haven't thought of that this fixes.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a27d3138..1921304a 100644
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,7 @@ distclean: clean
 # xmlto can not read from standard input, so we mess with a tmp file.
 %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
 	xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \
-	    xsltproc $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
+	    xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
 	    xmlto -o $(DOCS_DIR) $$opt man $<.tmp && \
 	    gzip -f $(DOCS_DIR)/`basename $< .xml`
 	rm -f $<.tmp
@@ -256,7 +256,7 @@ $(SOURCE_DIR)/%_usage.erl:
 		xmlto xhtml-nochunks `basename $< .xml`.xml ; rm `basename $< .xml`.xml
 	cat `basename $< .xml`.html | \
 	    xsltproc --novalid $(DOCS_DIR)/remove-namespaces.xsl - | \
-		xsltproc --stringparam original `basename $<` $(DOCS_DIR)/html-to-website-xml.xsl - | \
+		xsltproc --novalid --stringparam original `basename $<` $(DOCS_DIR)/html-to-website-xml.xsl - | \
 		xmllint --format - > $@
 	rm `basename $< .xml`.html
 
-- 
cgit v1.2.1