]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Switch HTML output from XHTML 1.0 Strict to HTML5
authorRich Bowen <rbowen@apache.org>
Sat, 30 May 2026 22:29:02 +0000 (22:29 +0000)
committerRich Bowen <rbowen@apache.org>
Sat, 30 May 2026 22:29:02 +0000 (22:29 +0000)
Change output method to "html" and emit <!DOCTYPE html> instead of
the XHTML 1.0 Strict doctype. Remove XHTML namespace declarations
and xml:lang attributes from all XSL stylesheets. Remove explicit
Content-Type meta tag (now auto-generated by the HTML serializer).

This resolves validate-xhtml failures caused by HTML5 features
(aria-* attributes, inline SVG) that are invalid under the
XHTML 1.0 Strict DTD.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934794 13f79535-47bb-0310-9956-ffa450edef68

25 files changed:
docs/manual/style/lang-targets.xml
docs/manual/style/manual.da.xsl
docs/manual/style/manual.de.xsl
docs/manual/style/manual.en.xsl
docs/manual/style/manual.es.xsl
docs/manual/style/manual.fr.xsl
docs/manual/style/manual.ja.xsl
docs/manual/style/manual.ko.xsl
docs/manual/style/manual.pt-br.xsl
docs/manual/style/manual.ru.xsl
docs/manual/style/manual.tr.xsl
docs/manual/style/manual.zh-cn.xsl
docs/manual/style/xsl/common.xsl
docs/manual/style/xsl/convmap.xsl
docs/manual/style/xsl/directiveindex.xsl
docs/manual/style/xsl/faq.xsl
docs/manual/style/xsl/indexpage.xsl
docs/manual/style/xsl/language.xsl
docs/manual/style/xsl/list_for_prettify.xsl
docs/manual/style/xsl/manualpage.xsl
docs/manual/style/xsl/moduleindex.xsl
docs/manual/style/xsl/overrideindex.xsl
docs/manual/style/xsl/quickreference.xsl
docs/manual/style/xsl/sitemap.xsl
docs/manual/style/xsl/synopsis.xsl

index 5063771f93ff888fde170eab3354fd1d1c3861b9..ad76bead4b37309175fbeb4300da7e40829c863f 100644 (file)
     </xmlvalidate>
 </target>
 
-</project>
+</project>
\ No newline at end of file
index 9d1d93d0252422039282fdd162a6425ef62928f1..f73f5330bf978533c883444310432617a8d35bd6 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="ISO-8859-1" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/da.xml')/language/messages/message"/>
index bae43d81a80b9af4462ab6d778a866a06ce1a772..61a9cafa08c23c16b0067700d044250b95f9874d 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="ISO-8859-1" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/de.xml')/language/messages/message"/>
index 00bb8e09586207d89a61a3b1e6371e4ef67a4f46..c6074a43a01e65761847267e2ebbfbbca7b3c573 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/en.xml')/language/messages/message"/>
index 5e612708a2f3a6e8935487129d65a04f437665fd..e08f53d2f19e758c6709668ed1faba82921aa9b1 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/es.xml')/language/messages/message"/>
index e8905ca9361c50d436f146cf2eddc4e761466982..40e9c6efd99051ad4d19daa68ae468760af6ccd8 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/fr.xml')/language/messages/message"/>
index ca5db3851fd21896a4b9da4fe771674a6072e2a4..e7d915c7a4c4398932c7404e2202c117d943e0e9 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/ja.xml')/language/messages/message"/>
index 25353d3e5b1efcfc03a8e8f17b38ee11b1d4d3d2..6b878e55ac6dbf990aa9778ccb598767a3badc62 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="EUC-KR" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="EUC-KR" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/ko.xml')/language/messages/message"/>
index d41298f591baa412d6f96ed14f093cd30790a6b7..569bae93a7104951fd3ea557e92516b0802ef8f1 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/pt-br.xml')/language/messages/message"/>
index b6c3c134a1b8e20de65e2b49a3e294dcb9a14360..c79ce83ae471df69f6e804b7df5710e322826fe8 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/ru.xml')/language/messages/message"/>
@@ -34,4 +34,4 @@
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
index 3f8d878f94176e93dd9831c01d8dadd7d995b335..8696535676342145a620e12e02cfeb24e388373e 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/tr.xml')/language/messages/message"/>
index 5c0e7e9125340ca0778b2ee6c144140ebf01ab4d..d5698105a3edd1794a43c42ba7de2d83747a4c0c 100644 (file)
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="html" encoding="UTF-8" indent="no" doctype-system="about:legacy-compat"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/zh-cn.xml')/language/messages/message"/>
index 286a30db8de4c8c9c9f3235447e1bef4056409fe..6aaf1648e24802fcd89c10b6768b0aee2ea7f08a 100644 (file)
@@ -26,7 +26,7 @@
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!--                                                                      -->
 <!-- Please, don't hard-code output strings! Use the language             -->
 <xsl:template name="head">
 <head>
     &lf;
-    <meta http-equiv="Content-Type"
-          content="text/html; charset={$output-encoding}" />&lf;
     <meta name="viewport" content="width=device-width, initial-scale=1" />&lf;
     <xsl:if test="not($is-chm or $is-zip)">
         <xsl:comment>
index da4444fe495c8905dcb1ea368298d8d6844404d4..4b77cade1ed0b6628bce41b0b670e51b1e49c5e4 100644 (file)
@@ -22,7 +22,7 @@
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <xsl:output method="text" encoding="ISO-8859-1" indent="no" />
 
index 0216e1a4a65bd3044bb7e2ee76c73c35968f3a65..8096ac437e93f52934802f3ac1d9c92d1d3beb9d 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <directiveindex>                                                     -->
 <!-- Builds the directive index page                                      -->
 <!-- ==================================================================== -->
 <xsl:template match="directiveindex">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <body id="directive-index">
index 344bdb61ed82d01f5fdc5156cc3725ed3dda5fcd..fe4d250a80d952202688e21fc86e7157c48193f6 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <faq>                                                                -->
 <!-- Process an entire document into an HTML page                         -->
 <!-- ==================================================================== -->
 <xsl:template match="faq">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <body id="manual-page">
index 83ca1717eaea82b58520d2ee8ee5df54e5d8cb10..f1a14d0e6200d947f57eb46682362322daaf61dd 100644 (file)
@@ -22,7 +22,7 @@
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!--                                                                      -->
 <!-- Three columns, select where the particular categories shall be       -->
@@ -48,7 +48,7 @@
 <!-- Process an entire document into an HTML page                         -->
 <!-- ==================================================================== -->
 <xsl:template match="/indexpage">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <body id="index-page">&lf;
index c8025b449054e7dcf3b5d2f813b1db7f95ea5fee..1c44c202f9761fde281431d15d183dd924ec7b46 100644 (file)
@@ -409,8 +409,10 @@ Some targets have additional requirements:
         <xsl:attribute name="method">
             <xsl:choose>
             <xsl:when test="$type = 'manual' or
-                            $type = 'chm' or
                             $type = 'zip'">
+                <xsl:text>html</xsl:text>
+            </xsl:when>
+            <xsl:when test="$type = 'chm'">
                 <xsl:text>xml</xsl:text>
             </xsl:when>
             <xsl:when test="$type = 'hhc' or
@@ -444,20 +446,10 @@ Some targets have additional requirements:
         </xsl:attribute>
         <xsl:attribute name="indent">no</xsl:attribute>
         <xsl:if test="$type = 'manual' or
-                      $type = 'chm' or
                       $type = 'zip'">
-            <xsl:attribute name="doctype-public">
-                <xsl:text>-//W3C//DTD XHTML 1.0 Strict//EN</xsl:text>
-            </xsl:attribute>
+            <xsl:attribute name="doctype-system">about:legacy-compat</xsl:attribute>
         </xsl:if>
-        <xsl:if test="$type = 'manual'">
-            <xsl:attribute name="doctype-system">
-                <xsl:text>http://www.w3.org/TR/xhtml1/DTD/</xsl:text>
-                <xsl:text>xhtml1-strict.dtd</xsl:text>
-            </xsl:attribute>
-        </xsl:if>
-        <xsl:if test="$type = 'chm' or
-                      $type = 'zip'">
+        <xsl:if test="$type = 'chm'">
             <xsl:attribute name="omit-xml-declaration">yes</xsl:attribute>
         </xsl:if>
     </xsl:element>
index 65306cb8e90a6e93e986016639471a6dbae62043..b380db67dd0e9341b62668136577aab649b420ca 100644 (file)
@@ -22,7 +22,7 @@
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <xsl:output method="text" encoding="ISO-8859-1" indent="no" />
 
index 70a6d0a24d23d8e1a1560ce80ad177d78cf59de7..73513d7044d52e4bacf4d1cc6422047108acd8ad 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <manualpage>                                                         -->
 <!-- Process an entire document into an HTML page                         -->
 <!-- ==================================================================== -->
 <xsl:template match="manualpage">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head" />&lf;
 
     <body id="manual-page">
index ad54441326cbbadf95a71556f7d92ffd02b0caf4..b892ac82a31ad8444b3870983fef73f61543ba70 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <moduleindex>                                                        -->
 <!-- Builds the moduleindex page                                          -->
 <!-- ==================================================================== -->
 <xsl:template match="moduleindex">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <body id="module-index">
index 60fa02a9f6cc563e374279eeb289ad71eba9a06a..2867a956f192064a794893b9ff243e6846273d7b 100644 (file)
@@ -28,7 +28,7 @@
                 xmlns:httpd="http://httpd.apache.org/xsl/manual"
                 xmlns:set="http://exslt.org/sets"
                 xmlns:str="http://exslt.org/strings"
-                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns=""
                 exclude-result-prefixes="exslt func httpd set str">
 
 <!-- ======================================================================= -->
@@ -36,7 +36,7 @@
 <!-- Builds the .htaccess overridable directive index                        -->
 <!-- ======================================================================= -->
 <xsl:template match="overrideindex">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <xsl:variable name="directives"
index 9484af399165d08fe43089aabde6be46c0c78393..46a54f9948bb58bbe4fedc45b1d8b3f00291bdd4 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <quickreference>                                                     -->
 <!-- Builds the directive quickreference page                             -->
 <!-- ==================================================================== -->
 <xsl:template match="quickreference">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head"/>&lf;
 
     <body id="directive-index">&lf;
index f72dafcbf889e2e3d867fd98153b8556bdd6f306..67f87235b993dd02a981ed03a215c0a4d92e5c27 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <sitemap>                                                            -->
 <!-- Process an entire document into an HTML page                         -->
 <!-- ==================================================================== -->
 <xsl:template match="/sitemap">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head" />&lf;
 
     <body id="manual-page">&lf;
index 35e728e6a2ba13d89ee8634eded4abbafe18171b..1f250202224e3814cb48a35a03e21bbbd976b932 100644 (file)
 ]>
 <xsl:stylesheet version="1.0"
               xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
+                  xmlns="">
 
 <!-- ==================================================================== -->
 <!-- <modulesynopsis>                                                     -->
 <!-- Process an entire document into an HTML page                         -->
 <!-- ==================================================================== -->
 <xsl:template match="modulesynopsis">
-<html xml:lang="{$doclang}" lang="{$doclang}">
+<html lang="{$doclang}">
     <xsl:call-template name="head" />&lf;
 
     <body>&lf;