[#657,!368,] fixed encoding in generated kea guide in html format

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 948fc9e58b844386ad6b6a1056c217c4f9f1128e..d49686c0018f1e6706efbc454bf7e474cd08f160 100644 (file)
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -12,7 +12,7 @@ DOCBOOK += hooks-ha.xml hooks-host-cache.xml hooks-lease-cmds.xml hooks-radius.x
 DOCBOOK += hooks-stat-cmds.xml lfc.xml stats.xml ctrl-channel.xml classify.xml shell.xml
 DOCBOOK += agent.xml netconf.xml api.xml congestion-handling.xml hammer.xml
 
-EXTRA_DIST = $(DOCBOOK)
+EXTRA_DIST = $(DOCBOOK) kea-docbook.xsl
 
 DISTCLEANFILES = $(HTMLDOCS) $(DOCS) kea-messages.xml
 
@@ -30,7 +30,7 @@ kea-guide.html: $(DOCBOOK)
                --stringparam section.autolabel 1 \
                --stringparam section.label.includes.component.label 1 \
                --stringparam html.stylesheet kea-guide.css \
-               http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
+               $(srcdir)/kea-docbook.xsl \
                $(srcdir)/kea-guide.xml
 
 kea-guide.txt: kea-guide.html
@@ -42,8 +42,8 @@ kea-messages.html: kea-messages.xml
                -o $@ \
                --stringparam generate.toc "book toc" \
                --stringparam html.stylesheet kea-guide.css \
-               http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
-               kea-messages.xml
+               $(srcdir)/kea-docbook.xsl \
+               $(srcdir)/kea-messages.xml
 
 else
 

diff --git a/doc/guide/kea-docbook.xsl b/doc/guide/kea-docbook.xsl
new file mode 100644 (file)
index 0000000..af61b7e
--- /dev/null
+++ b/doc/guide/kea-docbook.xsl
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+<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"/>
+
+  <!-- override encoding from ISO-8859-1 to UTF-8 -->
+  <xsl:output method="html"
+              encoding="UTF-8"
+              indent="no"/>
+
+</xsl:stylesheet>