summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-03 09:43:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-03 09:43:44 -0700
commitf9c8e7c8f134597f34315cb1b5fcd4598c3453ca (patch)
treeae819914f3309e0e74dae49bc87be572f083cb0b
parentMerge branch 'cb/maint-mergetool-no-tty' (diff)
parentdocs: fix Makefile dependency for user manual (diff)
downloadtgif-f9c8e7c8f134597f34315cb1b5fcd4598c3453ca.tar.xz
Merge branch 'jn/maint-doc-user-manual-html-doctype'
* jn/maint-doc-user-manual-html-doctype: docs: fix Makefile dependency for user manual Documentation: set a !DOCTYPE for user manual
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/docbook.xsl5
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index a4c4063e50..e117bc4315 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -279,7 +279,7 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
XSLT = docbook.xsl
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
-user-manual.html: user-manual.xml
+user-manual.html: user-manual.xml $(XSLT)
$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
mv $@+ $@
diff --git a/Documentation/docbook.xsl b/Documentation/docbook.xsl
index 9a6912c641..da8b05b922 100644
--- a/Documentation/docbook.xsl
+++ b/Documentation/docbook.xsl
@@ -1,5 +1,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'>
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
- <xsl:output method="html" encoding="UTF-8" indent="no" />
+ <xsl:output method="html"
+ encoding="UTF-8" indent="no"
+ doctype-public="-//W3C//DTD HTML 4.01//EN"
+ doctype-system="http://www.w3.org/TR/html4/strict.dtd" />
</xsl:stylesheet>