diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-05-31 11:18:56 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-05-31 11:18:56 +0100 |
| commit | c46dc531aff9ceb0a0b213c736975d5e2fded14d (patch) | |
| tree | 140205d34361e397d65f46767b4008a8360c0abc | |
| parent | fcbcf2ac0d8fa1230720adc317ef89dc5afeebeb (diff) | |
| parent | 03e22bf0d868d03974edeafb18d3bda22074e7eb (diff) | |
| download | rabbitmq-server-c46dc531aff9ceb0a0b213c736975d5e2fded14d.tar.gz | |
Merging bug24137 to default
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | docs/examples-to-end.xsl | 4 | ||||
| -rw-r--r-- | docs/usage.xsl | 4 |
3 files changed, 3 insertions, 11 deletions
@@ -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 @@ -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 @@ -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 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" /> 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"/> |