From 8511c56b4fa36df819f274d668f9f8e55b7008a5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Malo?= <nd@apache.org>
Date: Fri, 17 Apr 2015 20:03:16 +0000
Subject: [PATCH] backport http://svn.apache.org/r1674382

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1674390 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/style/xsl/common.xsl | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index f2ab9eb3071..124a886e776 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -103,13 +103,10 @@
 <!-- ==================================================================== -->
 <xsl:template name="head">
 <head>
-    <!-- the meta element is necessary for offline handling like CHM -->
-    <xsl:choose>
-    <xsl:when test="$is-chm or $is-zip">
-        <meta http-equiv="Content-Type"
-                 content="text/html; charset={$output-encoding}" />
-    </xsl:when>
-    <xsl:otherwise>
+    &lf;
+    <meta http-equiv="Content-Type"
+          content="text/html; charset={$output-encoding}" />&lf;
+    <xsl:if test="not($is-chm or $is-zip)">
         <xsl:comment>
             &lf;
             <xsl:text>        </xsl:text>
@@ -125,9 +122,8 @@
             <xsl:text>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>
             &lf;
             <xsl:text>      </xsl:text>
-        </xsl:comment>
-    </xsl:otherwise>
-    </xsl:choose>&lf;
+        </xsl:comment>&lf;
+    </xsl:if>
 
     <title>
         <xsl:choose>
-- 
2.47.3

