Skip to content

Commit 1cffddd

Browse files
committed
Mark user-manual as UTF-8
There have been several complaints against k.org's user-manual page. The document is generated in ISO-8859-1 by the xsltproc toolchain (I suspect this is because released docbook.xsl we use has xsl:output element that says the output is ISO-8859-1) but server delivers it with "charset=UTF-8", and all h*ll breaks loose. This attempts to force UTF-8 on the generating end. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8e64006 commit 1cffddd

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Documentation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ clean:
131131
user-manual.xml: user-manual.txt user-manual.conf
132132
$(ASCIIDOC) -b docbook -d book $<
133133

134-
XSLT = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
134+
XSLT = docbook.xsl
135135
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
136136

137137
user-manual.html: user-manual.xml

Documentation/docbook.xsl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
2+
version='1.0'>
3+
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
4+
<xsl:output method="html" encoding="UTF-8" indent="no" />
5+
</xsl:stylesheet>

0 commit comments

Comments
 (0)