From: Rich Bowen <rbowen@apache.org>
Date: Sun, 31 May 2026 13:54:29 +0000 (+0000)
Subject: Update build/style to build valid html5
X-Git-Tag: 2.4.68-rc1-candidate~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=203a26fd6cf35146ec09256158871d70c6478223;p=thirdparty%2Fapache%2Fhttpd.git

Update build/style to build valid html5

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934818 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/style/lang-targets.xml b/docs/manual/style/lang-targets.xml
index dcd6a18fb2..c3ee91e2fb 100644
--- a/docs/manual/style/lang-targets.xml
+++ b/docs/manual/style/lang-targets.xml
@@ -312,4 +312,4 @@
     </xmlvalidate>
 </target>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/docs/manual/style/manual.da.xsl b/docs/manual/style/manual.da.xsl
index 9d1d93d025..f73f5330bf 100644
--- a/docs/manual/style/manual.da.xsl
+++ b/docs/manual/style/manual.da.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.de.xsl b/docs/manual/style/manual.de.xsl
index bae43d81a8..61a9cafa08 100644
--- a/docs/manual/style/manual.de.xsl
+++ b/docs/manual/style/manual.de.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl
index 00bb8e0958..c6074a43a0 100644
--- a/docs/manual/style/manual.en.xsl
+++ b/docs/manual/style/manual.en.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.es.xsl b/docs/manual/style/manual.es.xsl
index 50f61f8dce..f6a3a1ba5d 100644
--- a/docs/manual/style/manual.es.xsl
+++ b/docs/manual/style/manual.es.xsl
@@ -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/es.xml')/language/messages/message"/>
diff --git a/docs/manual/style/manual.fr.xsl b/docs/manual/style/manual.fr.xsl
index e8905ca936..40e9c6efd9 100644
--- a/docs/manual/style/manual.fr.xsl
+++ b/docs/manual/style/manual.fr.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.ja.xsl b/docs/manual/style/manual.ja.xsl
index ca5db3851f..e7d915c7a4 100644
--- a/docs/manual/style/manual.ja.xsl
+++ b/docs/manual/style/manual.ja.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.ko.xsl b/docs/manual/style/manual.ko.xsl
index 25353d3e5b..6b878e55ac 100644
--- a/docs/manual/style/manual.ko.xsl
+++ b/docs/manual/style/manual.ko.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.pt-br.xsl b/docs/manual/style/manual.pt-br.xsl
index d41298f591..569bae93a7 100644
--- a/docs/manual/style/manual.pt-br.xsl
+++ b/docs/manual/style/manual.pt-br.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
index b6c3c134a1..c79ce83ae4 100644
--- a/docs/manual/style/manual.ru.xsl
+++ b/docs/manual/style/manual.ru.xsl
@@ -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
diff --git a/docs/manual/style/manual.tr.xsl b/docs/manual/style/manual.tr.xsl
index 3f8d878f94..8696535676 100644
--- a/docs/manual/style/manual.tr.xsl
+++ b/docs/manual/style/manual.tr.xsl
@@ -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"/>
diff --git a/docs/manual/style/manual.zh-cn.xsl b/docs/manual/style/manual.zh-cn.xsl
index 5c0e7e9125..d5698105a3 100644
--- a/docs/manual/style/manual.zh-cn.xsl
+++ b/docs/manual/style/manual.zh-cn.xsl
@@ -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"/>
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 7aa978fe81..d03675162e 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -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             -->
@@ -106,8 +106,6 @@
 <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>
@@ -175,7 +173,7 @@
            rel="stylesheet"
            href="{$path}/style/css/manual-print.css"/>
     <link href="{$path}/style/css/prettify.css" type="text/css" rel="stylesheet" />&lf;
-    <script type="text/javascript" src="{$path}/style/scripts/prettify.min.js">&lf;</script>&lf;
+    <script src="{$path}/style/scripts/prettify.min.js">&lf;</script>&lf;
     <!-- chm files do not need a favicon -->
     <xsl:if test="not($is-chm or $is-zip)">&lf;
         <link rel="shortcut icon" href="{$path}/images/favicon.png" />
@@ -417,7 +415,7 @@
 
 </div> <!-- /footer -->
 
-<script type="text/javascript">
+<script>
 <xsl:text disable-output-escaping="yes"><![CDATA[<!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
@@ -517,9 +515,8 @@ if (qv) {
     <h2>
         <xsl:choose>
         <xsl:when test="@id">
-          <a id="{@id}" name="{@id}">
-              <xsl:apply-templates select="title" mode="print" />
-          </a>
+          <xsl:attribute name="id"><xsl:value-of select="@id" /></xsl:attribute>
+          <xsl:apply-templates select="title" mode="print" />
           <xsl:text> </xsl:text>
           <a class="permalink" href="#{@id}" title="{$message[@id='permalink']}">&para;</a>
         </xsl:when>
@@ -545,9 +542,8 @@ if (qv) {
 <h3>
     <xsl:choose>
     <xsl:when test="@id">
-        <a id="{@id}" name="{@id}">
-            <xsl:apply-templates select="title" mode="print" />
-        </a>
+        <xsl:attribute name="id"><xsl:value-of select="@id" /></xsl:attribute>
+        <xsl:apply-templates select="title" mode="print" />
     </xsl:when>
 
     <xsl:otherwise>
@@ -570,9 +566,8 @@ if (qv) {
 <h4>
     <xsl:choose>
     <xsl:when test="@id">
-        <a id="{@id}" name="{@id}">
-            <xsl:apply-templates select="title" mode="print" />
-        </a>
+        <xsl:attribute name="id"><xsl:value-of select="@id" /></xsl:attribute>
+        <xsl:apply-templates select="title" mode="print" />
     </xsl:when>
 
     <xsl:otherwise>
diff --git a/docs/manual/style/xsl/convmap.xsl b/docs/manual/style/xsl/convmap.xsl
index 6a07ae246f..06f13f0139 100644
--- a/docs/manual/style/xsl/convmap.xsl
+++ b/docs/manual/style/xsl/convmap.xsl
@@ -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="utf-8" indent="no" />
 
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index 0216e1a4a6..8096ac437e 100644
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -22,14 +22,14 @@
 ]>
 <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">
diff --git a/docs/manual/style/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl
index 344bdb61ed..fe4d250a80 100644
--- a/docs/manual/style/xsl/faq.xsl
+++ b/docs/manual/style/xsl/faq.xsl
@@ -22,14 +22,14 @@
 ]>
 <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">
diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
index 83ca1717ea..f1a14d0e62 100644
--- a/docs/manual/style/xsl/indexpage.xsl
+++ b/docs/manual/style/xsl/indexpage.xsl
@@ -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;
diff --git a/docs/manual/style/xsl/language.xsl b/docs/manual/style/xsl/language.xsl
index 1e1a76a971..43a728e73e 100644
--- a/docs/manual/style/xsl/language.xsl
+++ b/docs/manual/style/xsl/language.xsl
@@ -408,8 +408,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
@@ -443,20 +445,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>
diff --git a/docs/manual/style/xsl/list_for_prettify.xsl b/docs/manual/style/xsl/list_for_prettify.xsl
index a97b7d67e2..0fdde1bf67 100644
--- a/docs/manual/style/xsl/list_for_prettify.xsl
+++ b/docs/manual/style/xsl/list_for_prettify.xsl
@@ -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="">
 
 <!-- Shoud have encoding="ISO-8859-1" but works better without -->
 <xsl:output method="text" indent="no" />
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
index 70a6d0a24d..73513d7044 100644
--- a/docs/manual/style/xsl/manualpage.xsl
+++ b/docs/manual/style/xsl/manualpage.xsl
@@ -22,14 +22,14 @@
 ]>
 <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">
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index ad54441326..b892ac82a3 100644
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -22,14 +22,14 @@
 ]>
 <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">
diff --git a/docs/manual/style/xsl/overrideindex.xsl b/docs/manual/style/xsl/overrideindex.xsl
index 60fa02a9f6..2867a956f1 100644
--- a/docs/manual/style/xsl/overrideindex.xsl
+++ b/docs/manual/style/xsl/overrideindex.xsl
@@ -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"
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index 84cf20d502..3096517bed 100644
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -22,14 +22,14 @@
 ]>
 <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;
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index f72dafcbf8..67f87235b9 100644
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -22,14 +22,14 @@
 ]>
 <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;
diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index 35e728e6a2..ffc0008c8a 100644
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -23,14 +23,14 @@
 ]>
 <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;
@@ -372,12 +372,11 @@
         <!-- Directive heading gets both mixed case and lowercase      -->
         <!-- anchors, and includes lt/gt only for "section" directives -->
         <h2>
+            <xsl:attribute name="id"><xsl:value-of select="$lowername" /></xsl:attribute>
             <xsl:choose>
             <xsl:when test="$message
                             [@id='directive']/@before-name = 'yes'">
-                <a id="{$lowername}" name="{$lowername}">
-                    <xsl:value-of select="$message[@id='directive']" />
-                </a>
+                <xsl:value-of select="$message[@id='directive']" />
 
                 <xsl:choose>
                 <xsl:when test="$message
@@ -390,19 +389,19 @@
                 </xsl:otherwise>
                 </xsl:choose>
 
-                <a id="{$directivename}" name="{$directivename}">
+                <span id="{$directivename}">
                     <xsl:if test="@type='section'">&lt;</xsl:if>
                     <xsl:value-of select="name" />
                     <xsl:if test="@type='section'">&gt;</xsl:if>
-                </a>
+                </span>
             </xsl:when>
 
             <xsl:otherwise>
-                <a id="{$directivename}" name="{$directivename}">
+                <span id="{$directivename}">
                     <xsl:if test="@type='section'">&lt;</xsl:if>
                     <xsl:value-of select="name" />
                     <xsl:if test="@type='section'">&gt;</xsl:if>
-                </a>
+                </span>
 
                 <xsl:choose>
                 <xsl:when test="$message
@@ -415,9 +414,7 @@
                 </xsl:otherwise>
                 </xsl:choose>
 
-                <a id="{$lowername}" name="{$lowername}">
-                    <xsl:value-of select="$message[@id='directive']" />
-                </a>
+                <xsl:value-of select="$message[@id='directive']" />
             </xsl:otherwise>
             </xsl:choose>
         <xsl:text> </xsl:text>