[gentoo-commits] proj/devmanual:master commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     9d1c9c91bfaf6ac29eb1fc797417755ab47f9b06
Author:     Thomas D <whissi <AT> whissi <DOT> de>
AuthorDate: Thu May 12 15:45:46 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 15 11:47:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9d1c9c91

devbook.xsl: Make UTF-8 usage and output more explicit

Since commit 460a315b2952e8b9753969e84a19647531ec45b4 we are using
a UTF-8 character in devbook.xsl. By adding an explicit XML encoding
header we hopefully make sure that nothing will mess it up.

Also we were duplicating the charset header in the HTML output because
docbook already sets the META tag before we set our own in the template.
Fixed by removing our declaration.

 devbook.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ced6901..dce6595 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
   xmlns:str="http://exslt.org/strings"
   xmlns:exslt="http://exslt.org/common"
@@ -11,7 +12,7 @@
 <xsl:import href="xsl/lang.highlight.m4.xsl"/>
 <xsl:import href="xsl/lang.highlight.sgml.xsl"/>
 
-<xsl:output method="html" indent="yes" omit-xml-declaration="yes"/>
+<xsl:output method="html" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:variable name="newline">
 <xsl:text>
@@ -426,7 +427,6 @@
         </xsl:call-template>
       </xsl:variable>
       <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
-      <meta charset="utf-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
       <link href="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.css" rel="stylesheet" media="screen" />