From 9346f9877fe62a1932f3322ba2e009dca41c2f86 Mon Sep 17 00:00:00 2001
From: Andre Malo <nd@apache.org>
Date: Mon, 23 Sep 2002 03:40:12 +0000
Subject: [PATCH] move module list into sitemap.xml allmodules.xml is no longer
 needed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96955 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/allmodules.xml           |  57 ---------
 docs/manual/mod/directives.xml           |   4 +-
 docs/manual/mod/index.xml                |   5 +-
 docs/manual/mod/quickreference.xml       |   4 +-
 docs/manual/sitemap.html.en              | 147 ++++++++++++++++++++++-
 docs/manual/sitemap.xml                  |  59 ++++++++-
 docs/manual/style/modulesynopsis.dtd     |  14 +--
 docs/manual/style/xsl/common.xsl         |   3 +-
 docs/manual/style/xsl/directiveindex.xsl |  22 ++--
 docs/manual/style/xsl/moduleindex.xsl    |   4 +-
 docs/manual/style/xsl/quickreference.xsl |  15 ++-
 docs/manual/style/xsl/sitemap.xsl        |  16 ++-
 12 files changed, 248 insertions(+), 102 deletions(-)
 delete mode 100644 docs/manual/mod/allmodules.xml

diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml
deleted file mode 100644
index a01c24b4a6..0000000000
--- a/docs/manual/mod/allmodules.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<modulefilelist>
-  <modulefile>core.xml</modulefile>
-  <modulefile>mod_access.xml</modulefile>
-  <modulefile>mod_actions.xml</modulefile>
-  <modulefile>mod_alias.xml</modulefile>
-  <modulefile>mod_asis.xml</modulefile>
-  <modulefile>mod_auth.xml</modulefile>
-  <modulefile>mod_auth_anon.xml</modulefile>
-  <modulefile>mod_auth_dbm.xml</modulefile>
-  <modulefile>mod_auth_digest.xml</modulefile>
-  <modulefile>mod_auth_ldap.xml</modulefile>
-  <modulefile>mod_autoindex.xml</modulefile>
-  <modulefile>mod_cache.xml</modulefile>
-  <modulefile>mod_cern_meta.xml</modulefile>
-  <modulefile>mod_cgi.xml</modulefile>
-  <modulefile>mod_cgid.xml</modulefile>
-  <modulefile>mod_charset_lite.xml</modulefile>
-  <modulefile>mod_dav.xml</modulefile>
-  <modulefile>mod_deflate.xml</modulefile>
-  <modulefile>mod_dir.xml</modulefile>
-  <modulefile>mod_echo.xml</modulefile>
-  <modulefile>mod_env.xml</modulefile>
-  <modulefile>mod_example.xml</modulefile>
-  <modulefile>mod_expires.xml</modulefile>
-  <modulefile>mod_ext_filter.xml</modulefile>
-  <modulefile>mod_file_cache.xml</modulefile>
-  <modulefile>mod_headers.xml</modulefile>
-  <modulefile>mod_imap.xml</modulefile>
-  <modulefile>mod_include.xml</modulefile>
-  <modulefile>mod_info.xml</modulefile>
-  <modulefile>mod_isapi.xml</modulefile>
-  <modulefile>mod_ldap.xml</modulefile>
-  <modulefile>mod_log_config.xml</modulefile>
-  <modulefile>mod_mime.xml</modulefile>
-  <modulefile>mod_mime_magic.xml</modulefile>
-  <modulefile>mod_negotiation.xml</modulefile>
-  <modulefile>mod_proxy.xml</modulefile>
-  <modulefile>mod_rewrite.xml</modulefile>
-  <modulefile>mod_setenvif.xml</modulefile>
-  <modulefile>mod_so.xml</modulefile>
-  <modulefile>mod_ssl.xml</modulefile>
-  <modulefile>mod_speling.xml</modulefile>
-  <modulefile>mod_status.xml</modulefile>
-  <modulefile>mod_suexec.xml</modulefile>
-  <modulefile>mod_unique_id.xml</modulefile>
-  <modulefile>mod_userdir.xml</modulefile>
-  <modulefile>mod_usertrack.xml</modulefile>
-  <modulefile>mod_vhost_alias.xml</modulefile>
-  <modulefile>mpm_common.xml</modulefile>
-  <modulefile>mpm_netware.xml</modulefile>
-  <modulefile>mpm_winnt.xml</modulefile>
-  <modulefile>perchild.xml</modulefile>
-  <modulefile>prefork.xml</modulefile>
-  <modulefile>worker.xml</modulefile>
-</modulefilelist>
diff --git a/docs/manual/mod/directives.xml b/docs/manual/mod/directives.xml
index 9373761b0b..4fbabd9685 100644
--- a/docs/manual/mod/directives.xml
+++ b/docs/manual/mod/directives.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE directiveindex SYSTEM "../style/modulesynopsis.dtd"
-  [ <!ENTITY allmodules SYSTEM "allmodules.xml"> ]
+  [ <!ENTITY sitemap SYSTEM "../sitemap.xml"> ]
 >
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
 
@@ -22,5 +22,5 @@
     </p>
   </summary>
 
-  &allmodules;
+  &sitemap;
 </directiveindex>
\ No newline at end of file
diff --git a/docs/manual/mod/index.xml b/docs/manual/mod/index.xml
index 462b9508ec..181fd2aaea 100644
--- a/docs/manual/mod/index.xml
+++ b/docs/manual/mod/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE moduleindex SYSTEM "../style/modulesynopsis.dtd"
-  [ <!ENTITY allmodules SYSTEM "allmodules.xml"> ]
+  [ <!ENTITY sitemap SYSTEM "../sitemap.xml"> ]
 >
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
 
@@ -14,5 +14,6 @@
       directives</a>.
     </p>
   </summary>
-  &allmodules;
+
+  &sitemap;
 </moduleindex>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.xml b/docs/manual/mod/quickreference.xml
index 46310bf25a..219c39f002 100644
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE quickreference SYSTEM "../style/modulesynopsis.dtd"
-  [ <!ENTITY allmodules SYSTEM "allmodules.xml"> ]
+  [ <!ENTITY sitemap SYSTEM "../sitemap.xml"> ]
 >
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
 
@@ -39,5 +39,5 @@
     </table>
   </legend>
 
-  &allmodules;
+  &sitemap;
 </quickreference>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index c84c82a053..efc560d9d4 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -7,8 +7,145 @@
       --><title>Site Map - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Site Map</h1>
 <p>This page lists the currently available documents of the
 <a href="./">Apache HTTP Server Version 2.0 Documentation</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#release">Release Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">Using the Apache HTTP Server</a></li><li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache Virtual Host documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache Server Frequently Asked Questions</a></li><li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache SSL/TLS Encryption</a></li><li><img alt="" src="./images/down.gif" /> <a href="#howto">Guides, Tutorials, and HowTos</a></li><li><img alt="" src="./images/down.gif" /> <a href="#platform">Platform-specific Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Server and Supporting Programs</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache Miscellaneous Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache modules</a></li><li><img alt="" src="./images/down.gif" /> <a href="#developer">Developer Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#descriptive">Descriptive Information</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="release" id="release">Release Notes</a></h2><ul><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li><li><a href="new_features_2_0.html">New features with Apache 2.0</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="using" id="using">Using the Apache HTTP Server</a></h2><ul><li><a href="install.html">Compiling and Installing Apache</a></li><li><a href="invoking.html">Starting Apache</a></li><li><a href="stopping.html">Stopping and Restarting the Server</a></li><li><a href="configuring.html">Configuration Files</a></li><li><a href="sections.html">How Directory, Location and Files sections work</a></li><li><a href="server-wide.html">Server-Wide Configuration</a></li><li><a href="logs.html">Log Files</a></li><li><a href="urlmapping.html">Mapping URLs to Filesystem Locations</a></li><li><a href="misc/security_tips.html">Security Tips</a></li><li><a href="dso.html">Dynamic Shared Object (DSO) support</a></li><li><a href="content-negotiation.html">Content Negotiation</a></li><li><a href="custom-error.html">Custom error responses</a></li><li><a href="bind.html">Setting which addresses and ports Apache uses</a></li><li><a href="mpm.html">Multi-Processing Modules (MPMs)</a></li><li><a href="env.html">Environment Variables in Apache</a></li><li><a href="handler.html">Apache's Handler Use</a></li><li><a href="filter.html">Filters</a></li><li><a href="suexec.html">suEXEC Support</a></li><li><a href="misc/perf-tuning.html">Performance Hintes</a></li><li><a href="misc/rewriteguide.html">URL Rewriting Guide</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="vhosts" id="vhosts">Apache Virtual Host documentation</a></h2><ul><li class="separate"><a href="vhosts/">Overview</a></li><li><a href="vhosts/name-based.html">Name-based Virtual Hosts</a></li><li><a href="vhosts/ip-based.html">IP-based Virtual Host Support</a></li><li><a href="vhosts/mass.html">Dynamically configured mass virtual hosting</a></li><li><a href="vhosts/examples.html">VirtualHost Examples</a></li><li><a href="vhosts/details.html">An In-Depth Discussion of Virtual Host Matching</a></li><li><a href="vhosts/fd-limits.html">File descriptor limitations</a></li><li><a href="dns-caveats.html">Issues Regarding DNS and Apache</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="faq" id="faq">Apache Server Frequently Asked Questions</a></h2><ul><li class="separate"><a href="faq/">Overview</a></li><li><a href="faq/support.html">Support</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2><ul><li class="separate"><a href="ssl/">Overview</a></li><li><a href="ssl/ssl_intro.html">SSL/TLS Encryption: An Introduction</a></li><li><a href="ssl/ssl_compat.html">SSL/TLS Encryption: Compatibility</a></li><li><a href="ssl/ssl_howto.html">SSL/TLS Encryption: How-To</a></li><li><a href="ssl/ssl_faq.html">SSL/TLS Encryption: FAQ</a></li><li><a href="ssl/ssl_glossary.html">SSL/TLS Encryption: Glossary</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="howto" id="howto">Guides, Tutorials, and HowTos</a></h2><ul><li><a href="howto/auth.html">Authentication</a></li><li><a href="howto/cgi.html">Dynamic Content with CGI</a></li><li><a href="howto/ssi.html">Introduction to Server Side Includes</a></li><li><a href="howto/htaccess.html">.htaccess files</a></li><li><a href="howto/public_html.html">Per-user web directories</a></li><li><a href="misc/tutorials.html">Apache Tutorials</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="platform" id="platform">Platform-specific Notes</a></h2><ul><li><a href="platform/windows.html">Using Apache with Microsoft
-Windows</a></li><li><a href="platform/win_compiling.html">Compiling Apache for
-Microsoft Windows</a></li><li><a href="platform/win_service.html">Running Apache for Windows as
-a Service</a></li><li><a href="platform/netware.html">Using Apache with Novell NetWare</a></li><li><a href="platform/perf-hp.html">Running a High-Performance Web
-Server on HPUX</a></li><li><a href="ebcdic.html">The Apache EBCDIC Port</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="programs" id="programs">Apache HTTP Server and Supporting Programs</a></h2><ul><li class="separate"><a href="programs/">Overview</a></li><li><a href="programs/httpd.html">Manual Page: httpd</a></li><li><a href="programs/ab.html">Manual Page: ab</a></li><li><a href="programs/apachectl.html">Manual Page: apachectl</a></li><li><a href="programs/apxs.html">Manual Page: apxs</a></li><li><a href="programs/dbmmanage.html">Manual Page: dbmmanage</a></li><li><a href="programs/htdigest.html">Manual Page: htdigest</a></li><li><a href="programs/htpasswd.html">Manual Page: htpasswd</a></li><li><a href="programs/logresolve.html">Manual Page: logresolve</a></li><li><a href="programs/rotatelogs.html">Manual Page: rotatelogs</a></li><li><a href="programs/suexec.html">Manual Page: suexec</a></li><li><a href="programs/other.html">Other Programs</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="misc" id="misc">Apache Miscellaneous Documentation</a></h2><ul><li class="separate"><a href="misc/">Overview</a></li><li><a href="misc/custom_errordocs.html">International Customized Server Error Messages</a></li><li><a href="misc/fin_wait_2.html">Connections in FIN_WAIT_2 and Apache</a></li><li><a href="misc/known_client_problems.html">Known Client Problems</a></li><li><a href="misc/descriptors.html">Descriptors and Apache</a></li><li><a href="cgi_path.html">PATH_INFO Changes in the CGI Environment</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="modules" id="modules">Apache modules</a></h2><ul><li><a href="mod/">Module index</a></li><li><a href="mod/directives.html">Directive index</a></li><li><a href="mod/quickreference.html">Directive Quick-Reference</a></li></ul><ul><li><a href="mod/core.html">Apache Core Features</a></li><li><a href="mod/mpm_common.html">Apache MPM Common Directives</a></li><li><a href="mod/mpm_netware.html">Apache MPM netware</a></li><li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li><li><a href="mod/perchild.html">Apache MPM perchild</a></li><li><a href="mod/prefork.html">Apache MPM prefork</a></li><li><a href="mod/worker.html">Apache MPM worker</a></li><li><a href="mod/mod_access.html">Apache Module mod_access</a></li><li><a href="mod/mod_actions.html">Apache Module mod_actions</a></li><li><a href="mod/mod_alias.html">Apache Module mod_alias</a></li><li><a href="mod/mod_asis.html">Apache Module mod_asis</a></li><li><a href="mod/mod_auth.html">Apache Module mod_auth</a></li><li><a href="mod/mod_auth_anon.html">Apache Module mod_auth_anon</a></li><li><a href="mod/mod_auth_dbm.html">Apache Module mod_auth_dbm</a></li><li><a href="mod/mod_auth_digest.html">Apache Module mod_auth_digest</a></li><li><a href="mod/mod_auth_ldap.html">Apache Module mod_auth_ldap</a></li><li><a href="mod/mod_autoindex.html">Apache Module mod_autoindex</a></li><li><a href="mod/mod_cache.html">Apache Module mod_cache</a></li><li><a href="mod/mod_cern_meta.html">Apache Module mod_cern_meta</a></li><li><a href="mod/mod_cgi.html">Apache Module mod_cgi</a></li><li><a href="mod/mod_cgid.html">Apache Module mod_cgid</a></li><li><a href="mod/mod_charset_lite.html">Apache Module mod_charset_lite</a></li><li><a href="mod/mod_dav.html">Apache Module mod_dav</a></li><li><a href="mod/mod_deflate.html">Apache Module mod_deflate</a></li><li><a href="mod/mod_dir.html">Apache Module mod_dir</a></li><li><a href="mod/mod_echo.html">Apache Module mod_echo</a></li><li><a href="mod/mod_env.html">Apache Module mod_env</a></li><li><a href="mod/mod_example.html">Apache Module mod_example</a></li><li><a href="mod/mod_expires.html">Apache Module mod_expires</a></li><li><a href="mod/mod_ext_filter.html">Apache Module mod_ext_filter</a></li><li><a href="mod/mod_file_cache.html">Apache Module mod_file_cache</a></li><li><a href="mod/mod_headers.html">Apache Module mod_headers</a></li><li><a href="mod/mod_imap.html">Apache Module mod_imap</a></li><li><a href="mod/mod_include.html">Apache Module mod_include</a></li><li><a href="mod/mod_info.html">Apache Module mod_info</a></li><li><a href="mod/mod_isapi.html">Apache Module mod_isapi</a></li><li><a href="mod/mod_ldap.html">Apache Module mod_ldap</a></li><li><a href="mod/mod_log_config.html">Apache Module mod_log_config</a></li><li><a href="mod/mod_mime.html">Apache Module mod_mime</a></li><li><a href="mod/mod_mime_magic.html">Apache Module mod_mime_magic</a></li><li><a href="mod/mod_negotiation.html">Apache Module mod_negotiation</a></li><li><a href="mod/mod_proxy.html">Apache Module mod_proxy</a></li><li><a href="mod/mod_rewrite.html">Apache Module mod_rewrite</a></li><li><a href="mod/mod_setenvif.html">Apache Module mod_setenvif</a></li><li><a href="mod/mod_so.html">Apache Module mod_so</a></li><li><a href="mod/mod_speling.html">Apache Module mod_speling</a></li><li><a href="mod/mod_ssl.html">Apache Module mod_ssl</a></li><li><a href="mod/mod_status.html">Apache Module mod_status</a></li><li><a href="mod/mod_suexec.html">Apache Module mod_suexec</a></li><li><a href="mod/mod_unique_id.html">Apache Module mod_unique_id</a></li><li><a href="mod/mod_userdir.html">Apache Module mod_userdir</a></li><li><a href="mod/mod_usertrack.html">Apache Module mod_usertrack</a></li><li><a href="mod/mod_vhost_alias.html">Apache Module mod_vhost_alias</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="developer" id="developer">Developer Documentation</a></h2><ul><li class="separate"><a href="developer/">Overview</a></li><li><a href="developer/API.html">Apache API notes</a></li><li><a href="developer/debugging.html">Debugging Memory Allocation in APR</a></li><li><a href="developer/documenting.html">Documenting Apache 2.0</a></li><li><a href="developer/hooks.html">Apache 2.0 Hook Functions</a></li><li><a href="developer/layeredio.html">Apache 2.0 Layered I/O</a></li><li><a href="developer/modules.html">Converting Modules from Apache 1.3 to Apache 2.0</a></li><li><a href="developer/request.html">Request Processing in Apache 2.0</a></li><li><a href="developer/filters.html">How Filters Work in Apache 2.0</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="descriptive" id="descriptive">Descriptive Information</a></h2><ul><li><a href="mod/module-dict.html">Definitions of terms used to describe Apache modules</a></li><li><a href="mod/directive-dict.html">Definitions of terms used to describe Apache directives</a></li><li><a href="glossary.html">Glossary</a></li><li>Sitemap (this document)</li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#release">Release Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">Using the Apache HTTP Server</a></li><li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache Virtual Host documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache Server Frequently Asked Questions</a></li><li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache SSL/TLS Encryption</a></li><li><img alt="" src="./images/down.gif" /> <a href="#howto">Guides, Tutorials, and HowTos</a></li><li><img alt="" src="./images/down.gif" /> <a href="#platform">Platform-specific Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Server and Supporting Programs</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache Miscellaneous Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache modules</a></li><li><img alt="" src="./images/down.gif" /> <a href="#developer">Developer Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#descriptive">Descriptive Information</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="release" id="release">Release Notes</a></h2><ul><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
+<li><a href="new_features_2_0.html">New features with Apache 2.0</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="using" id="using">Using the Apache HTTP Server</a></h2><ul><li><a href="install.html">Compiling and Installing Apache</a></li>
+<li><a href="invoking.html">Starting Apache</a></li>
+<li><a href="stopping.html">Stopping and Restarting the Server</a></li>
+<li><a href="configuring.html">Configuration Files</a></li>
+<li><a href="sections.html">How Directory, Location and Files sections work</a></li>
+<li><a href="server-wide.html">Server-Wide Configuration</a></li>
+<li><a href="logs.html">Log Files</a></li>
+<li><a href="urlmapping.html">Mapping URLs to Filesystem Locations</a></li>
+<li><a href="misc/security_tips.html">Security Tips</a></li>
+<li><a href="dso.html">Dynamic Shared Object (DSO) support</a></li>
+<li><a href="content-negotiation.html">Content Negotiation</a></li>
+<li><a href="custom-error.html">Custom error responses</a></li>
+<li><a href="bind.html">Setting which addresses and ports Apache uses</a></li>
+<li><a href="mpm.html">Multi-Processing Modules (MPMs)</a></li>
+<li><a href="env.html">Environment Variables in Apache</a></li>
+<li><a href="handler.html">Apache's Handler Use</a></li>
+<li><a href="filter.html">Filters</a></li>
+<li><a href="suexec.html">suEXEC Support</a></li>
+<li><a href="misc/perf-tuning.html">Performance Hintes</a></li>
+<li><a href="misc/rewriteguide.html">URL Rewriting Guide</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="vhosts" id="vhosts">Apache Virtual Host documentation</a></h2><ul><li class="separate"><a href="vhosts/">Overview</a></li>
+<li><a href="vhosts/name-based.html">Name-based Virtual Hosts</a></li>
+<li><a href="vhosts/ip-based.html">IP-based Virtual Host Support</a></li>
+<li><a href="vhosts/mass.html">Dynamically configured mass virtual hosting</a></li>
+<li><a href="vhosts/examples.html">VirtualHost Examples</a></li>
+<li><a href="vhosts/details.html">An In-Depth Discussion of Virtual Host Matching</a></li>
+<li><a href="vhosts/fd-limits.html">File descriptor limitations</a></li>
+<li><a href="dns-caveats.html">Issues Regarding DNS and Apache</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="faq" id="faq">Apache Server Frequently Asked Questions</a></h2><ul><li class="separate"><a href="faq/">Overview</a></li>
+<li><a href="faq/support.html">Support</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2><ul><li class="separate"><a href="ssl/">Overview</a></li>
+<li><a href="ssl/ssl_intro.html">SSL/TLS Encryption: An Introduction</a></li>
+<li><a href="ssl/ssl_compat.html">SSL/TLS Encryption: Compatibility</a></li>
+<li><a href="ssl/ssl_howto.html">SSL/TLS Encryption: How-To</a></li>
+<li><a href="ssl/ssl_faq.html">SSL/TLS Encryption: FAQ</a></li>
+<li><a href="ssl/ssl_glossary.html">SSL/TLS Encryption: Glossary</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="howto" id="howto">Guides, Tutorials, and HowTos</a></h2><ul><li><a href="howto/auth.html">Authentication</a></li>
+<li><a href="howto/cgi.html">Dynamic Content with CGI</a></li>
+<li><a href="howto/ssi.html">Introduction to Server Side Includes</a></li>
+<li><a href="howto/htaccess.html">.htaccess files</a></li>
+<li><a href="howto/public_html.html">Per-user web directories</a></li>
+<li><a href="misc/tutorials.html">Apache Tutorials</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="platform" id="platform">Platform-specific Notes</a></h2><ul><li><a href="platform/windows.html">Using Apache with Microsoft
+Windows</a></li>
+<li><a href="platform/win_compiling.html">Compiling Apache for
+Microsoft Windows</a></li>
+<li><a href="platform/win_service.html">Running Apache for Windows as
+a Service</a></li>
+<li><a href="platform/netware.html">Using Apache with Novell NetWare</a></li>
+<li><a href="platform/perf-hp.html">Running a High-Performance Web
+Server on HPUX</a></li>
+<li><a href="ebcdic.html">The Apache EBCDIC Port</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="programs" id="programs">Apache HTTP Server and Supporting Programs</a></h2><ul><li class="separate"><a href="programs/">Overview</a></li>
+<li><a href="programs/httpd.html">Manual Page: httpd</a></li>
+<li><a href="programs/ab.html">Manual Page: ab</a></li>
+<li><a href="programs/apachectl.html">Manual Page: apachectl</a></li>
+<li><a href="programs/apxs.html">Manual Page: apxs</a></li>
+<li><a href="programs/dbmmanage.html">Manual Page: dbmmanage</a></li>
+<li><a href="programs/htdigest.html">Manual Page: htdigest</a></li>
+<li><a href="programs/htpasswd.html">Manual Page: htpasswd</a></li>
+<li><a href="programs/logresolve.html">Manual Page: logresolve</a></li>
+<li><a href="programs/rotatelogs.html">Manual Page: rotatelogs</a></li>
+<li><a href="programs/suexec.html">Manual Page: suexec</a></li>
+<li><a href="programs/other.html">Other Programs</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="misc" id="misc">Apache Miscellaneous Documentation</a></h2><ul><li class="separate"><a href="misc/">Overview</a></li>
+<li><a href="misc/custom_errordocs.html">International Customized Server Error Messages</a></li>
+<li><a href="misc/fin_wait_2.html">Connections in FIN_WAIT_2 and Apache</a></li>
+<li><a href="misc/known_client_problems.html">Known Client Problems</a></li>
+<li><a href="misc/descriptors.html">Descriptors and Apache</a></li>
+<li><a href="cgi_path.html">PATH_INFO Changes in the CGI Environment</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="modules" id="modules">Apache modules</a></h2><ul><li><a href="mod/">Module index</a></li>
+<li><a href="mod/directives.html">Directive index</a></li>
+<li><a href="mod/quickreference.html">Directive Quick-Reference</a></li>
+</ul><ul><li><a href="mod/core.html">Apache Core Features</a></li>
+<li><a href="mod/mpm_common.html">Apache MPM Common Directives</a></li>
+<li><a href="mod/mpm_netware.html">Apache MPM netware</a></li>
+<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
+<li><a href="mod/perchild.html">Apache MPM perchild</a></li>
+<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
+<li><a href="mod/worker.html">Apache MPM worker</a></li>
+<li><a href="mod/mod_access.html">Apache Module mod_access</a></li>
+<li><a href="mod/mod_actions.html">Apache Module mod_actions</a></li>
+<li><a href="mod/mod_alias.html">Apache Module mod_alias</a></li>
+<li><a href="mod/mod_asis.html">Apache Module mod_asis</a></li>
+<li><a href="mod/mod_auth.html">Apache Module mod_auth</a></li>
+<li><a href="mod/mod_auth_anon.html">Apache Module mod_auth_anon</a></li>
+<li><a href="mod/mod_auth_dbm.html">Apache Module mod_auth_dbm</a></li>
+<li><a href="mod/mod_auth_digest.html">Apache Module mod_auth_digest</a></li>
+<li><a href="mod/mod_auth_ldap.html">Apache Module mod_auth_ldap</a></li>
+<li><a href="mod/mod_autoindex.html">Apache Module mod_autoindex</a></li>
+<li><a href="mod/mod_cache.html">Apache Module mod_cache</a></li>
+<li><a href="mod/mod_cern_meta.html">Apache Module mod_cern_meta</a></li>
+<li><a href="mod/mod_cgi.html">Apache Module mod_cgi</a></li>
+<li><a href="mod/mod_cgid.html">Apache Module mod_cgid</a></li>
+<li><a href="mod/mod_charset_lite.html">Apache Module mod_charset_lite</a></li>
+<li><a href="mod/mod_dav.html">Apache Module mod_dav</a></li>
+<li><a href="mod/mod_deflate.html">Apache Module mod_deflate</a></li>
+<li><a href="mod/mod_dir.html">Apache Module mod_dir</a></li>
+<li><a href="mod/mod_echo.html">Apache Module mod_echo</a></li>
+<li><a href="mod/mod_env.html">Apache Module mod_env</a></li>
+<li><a href="mod/mod_example.html">Apache Module mod_example</a></li>
+<li><a href="mod/mod_expires.html">Apache Module mod_expires</a></li>
+<li><a href="mod/mod_ext_filter.html">Apache Module mod_ext_filter</a></li>
+<li><a href="mod/mod_file_cache.html">Apache Module mod_file_cache</a></li>
+<li><a href="mod/mod_headers.html">Apache Module mod_headers</a></li>
+<li><a href="mod/mod_imap.html">Apache Module mod_imap</a></li>
+<li><a href="mod/mod_include.html">Apache Module mod_include</a></li>
+<li><a href="mod/mod_info.html">Apache Module mod_info</a></li>
+<li><a href="mod/mod_isapi.html">Apache Module mod_isapi</a></li>
+<li><a href="mod/mod_ldap.html">Apache Module mod_ldap</a></li>
+<li><a href="mod/mod_log_config.html">Apache Module mod_log_config</a></li>
+<li><a href="mod/mod_mime.html">Apache Module mod_mime</a></li>
+<li><a href="mod/mod_mime_magic.html">Apache Module mod_mime_magic</a></li>
+<li><a href="mod/mod_negotiation.html">Apache Module mod_negotiation</a></li>
+<li><a href="mod/mod_proxy.html">Apache Module mod_proxy</a></li>
+<li><a href="mod/mod_rewrite.html">Apache Module mod_rewrite</a></li>
+<li><a href="mod/mod_setenvif.html">Apache Module mod_setenvif</a></li>
+<li><a href="mod/mod_so.html">Apache Module mod_so</a></li>
+<li><a href="mod/mod_speling.html">Apache Module mod_speling</a></li>
+<li><a href="mod/mod_ssl.html">Apache Module mod_ssl</a></li>
+<li><a href="mod/mod_status.html">Apache Module mod_status</a></li>
+<li><a href="mod/mod_suexec.html">Apache Module mod_suexec</a></li>
+<li><a href="mod/mod_unique_id.html">Apache Module mod_unique_id</a></li>
+<li><a href="mod/mod_userdir.html">Apache Module mod_userdir</a></li>
+<li><a href="mod/mod_usertrack.html">Apache Module mod_usertrack</a></li>
+<li><a href="mod/mod_vhost_alias.html">Apache Module mod_vhost_alias</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="developer" id="developer">Developer Documentation</a></h2><ul><li class="separate"><a href="developer/">Overview</a></li>
+<li><a href="developer/API.html">Apache API notes</a></li>
+<li><a href="developer/debugging.html">Debugging Memory Allocation in APR</a></li>
+<li><a href="developer/documenting.html">Documenting Apache 2.0</a></li>
+<li><a href="developer/hooks.html">Apache 2.0 Hook Functions</a></li>
+<li><a href="developer/layeredio.html">Apache 2.0 Layered I/O</a></li>
+<li><a href="developer/modules.html">Converting Modules from Apache 1.3 to Apache 2.0</a></li>
+<li><a href="developer/request.html">Request Processing in Apache 2.0</a></li>
+<li><a href="developer/filters.html">How Filters Work in Apache 2.0</a></li>
+</ul></div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="descriptive" id="descriptive">Descriptive Information</a></h2><ul><li><a href="mod/module-dict.html">Definitions of terms used to describe Apache modules</a></li>
+<li><a href="mod/directive-dict.html">Definitions of terms used to describe Apache directives</a></li>
+<li><a href="glossary.html">Glossary</a></li>
+<li>Sitemap (this document)</li>
+</ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 5dbf6185f6..9d0a46bc6e 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd"
-    [ <!ENTITY allmodules SYSTEM "./mod/allmodules.xml"> ]
->
 <?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
 
 <sitemap>
@@ -127,7 +124,61 @@ Server on HPUX</page>
 <page href="mod/">Module index</page>
 <page href="mod/directives.html">Directive index</page>
 <page href="mod/quickreference.html">Directive Quick-Reference</page>
-&allmodules;
+<modulefilelist>
+  <modulefile>core.xml</modulefile>
+  <modulefile>mod_access.xml</modulefile>
+  <modulefile>mod_actions.xml</modulefile>
+  <modulefile>mod_alias.xml</modulefile>
+  <modulefile>mod_asis.xml</modulefile>
+  <modulefile>mod_auth.xml</modulefile>
+  <modulefile>mod_auth_anon.xml</modulefile>
+  <modulefile>mod_auth_dbm.xml</modulefile>
+  <modulefile>mod_auth_digest.xml</modulefile>
+  <modulefile>mod_auth_ldap.xml</modulefile>
+  <modulefile>mod_autoindex.xml</modulefile>
+  <modulefile>mod_cache.xml</modulefile>
+  <modulefile>mod_cern_meta.xml</modulefile>
+  <modulefile>mod_cgi.xml</modulefile>
+  <modulefile>mod_cgid.xml</modulefile>
+  <modulefile>mod_charset_lite.xml</modulefile>
+  <modulefile>mod_dav.xml</modulefile>
+  <modulefile>mod_deflate.xml</modulefile>
+  <modulefile>mod_dir.xml</modulefile>
+  <modulefile>mod_echo.xml</modulefile>
+  <modulefile>mod_env.xml</modulefile>
+  <modulefile>mod_example.xml</modulefile>
+  <modulefile>mod_expires.xml</modulefile>
+  <modulefile>mod_ext_filter.xml</modulefile>
+  <modulefile>mod_file_cache.xml</modulefile>
+  <modulefile>mod_headers.xml</modulefile>
+  <modulefile>mod_imap.xml</modulefile>
+  <modulefile>mod_include.xml</modulefile>
+  <modulefile>mod_info.xml</modulefile>
+  <modulefile>mod_isapi.xml</modulefile>
+  <modulefile>mod_ldap.xml</modulefile>
+  <modulefile>mod_log_config.xml</modulefile>
+  <modulefile>mod_mime.xml</modulefile>
+  <modulefile>mod_mime_magic.xml</modulefile>
+  <modulefile>mod_negotiation.xml</modulefile>
+  <modulefile>mod_proxy.xml</modulefile>
+  <modulefile>mod_rewrite.xml</modulefile>
+  <modulefile>mod_setenvif.xml</modulefile>
+  <modulefile>mod_so.xml</modulefile>
+  <modulefile>mod_ssl.xml</modulefile>
+  <modulefile>mod_speling.xml</modulefile>
+  <modulefile>mod_status.xml</modulefile>
+  <modulefile>mod_suexec.xml</modulefile>
+  <modulefile>mod_unique_id.xml</modulefile>
+  <modulefile>mod_userdir.xml</modulefile>
+  <modulefile>mod_usertrack.xml</modulefile>
+  <modulefile>mod_vhost_alias.xml</modulefile>
+  <modulefile>mpm_common.xml</modulefile>
+  <modulefile>mpm_netware.xml</modulefile>
+  <modulefile>mpm_winnt.xml</modulefile>
+  <modulefile>perchild.xml</modulefile>
+  <modulefile>prefork.xml</modulefile>
+  <modulefile>worker.xml</modulefile>
+</modulefilelist>
 </category>
 
 <category id="developer">
diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd
index dc990a7d18..2bbac0ada9 100644
--- a/docs/manual/style/modulesynopsis.dtd
+++ b/docs/manual/style/modulesynopsis.dtd
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<!ENTITY % common SYSTEM "common.dtd">
-%common;
+<!ENTITY % sitemap SYSTEM "sitemap.dtd">
+%sitemap;
 
 <!ELEMENT modulesynopsis (name , description, status , sourcefile?,
 identifier? , compatibility? , summary? , seealso* , section*,
@@ -38,16 +38,12 @@ usage?, seealso*)>
 
 <!ELEMENT usage %Block;>
 
-<!-- Used in allmodules.xml -->
-<!ELEMENT modulefilelist (modulefile+)>
-<!ELEMENT modulefile (#PCDATA)>
-
 <!-- Used in index.xml -->
-<!ELEMENT moduleindex (title | summary | modulefilelist)+>
+<!ELEMENT moduleindex (title | summary | sitemap)+>
 
 <!-- Used in directive.xml -->
-<!ELEMENT directiveindex (title | summary | modulefilelist)+>
+<!ELEMENT directiveindex (title | summary | sitemap)+>
 
 <!-- Used in quickreference.xml -->
-<!ELEMENT quickreference (title | summary | legend | modulefilelist)+>
+<!ELEMENT quickreference (title | summary | legend | sitemap)+>
 <!ELEMENT legend (table, table)>
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 548f400b3b..01df2333fc 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -632,12 +632,13 @@
   <!-- used in several documents                          -->
   <!--                                                    -->
   <xsl:template name="directive-startletters">
+  <xsl:param name="directives"/>
 
     <xsl:call-template name="_squeeze-letters">
       <xsl:with-param name="lastletter" select="''"/>
 
       <xsl:with-param name="letters">
-        <xsl:for-each select="document(/*/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)]">
+        <xsl:for-each select="$directives">
         <xsl:sort select="name"/>
           <xsl:value-of select="translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)"/>
         </xsl:for-each>
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index 4b5275defb..50fee821f1 100644
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -15,9 +15,13 @@
       <body id="directive-index">
         <xsl:call-template name="top"/>
 
+        <xsl:variable name="directives" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)]"/>
+
         <!-- collect the start letters -->
         <xsl:variable name="start-letters">
-          <xsl:call-template name="directive-startletters" />
+          <xsl:call-template name="directive-startletters">
+            <xsl:with-param name="directives" select="$directives"/>
+          </xsl:call-template>
         </xsl:variable>
 
         <div id="preamble">
@@ -45,18 +49,10 @@
           <ul>
             <xsl:call-template name="dindex-of-letter">
               <xsl:with-param name="letters-todo" select="$start-letters"/>
+              <xsl:with-param name="directives" select="$directives"/>
             </xsl:call-template>
-
-            <xsl:if test="letters">
-              <xsl:for-each select="letters/*">
-                <xsl:variable name="letter" select="."/>
-
-              </xsl:for-each> <!-- /letters -->
-            </xsl:if>
-            <!-- /if letters -->
-
           </ul>
-        </div> <!-- /directive-index -->
+        </div> <!-- /directive-list -->
 
         <xsl:call-template name="bottom"/>
       </body>
@@ -71,10 +67,11 @@
   <!--                                                     -->
   <xsl:template name="dindex-of-letter">
   <xsl:param name="letters-todo"/>
+  <xsl:param name="directives"/>
 
     <xsl:variable name="letter" select="substring($letters-todo,1,1)"/>
 
-    <xsl:for-each select="document(/*/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)][$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]">
+    <xsl:for-each select="$directives[$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]">
     <xsl:sort select="name"/>
 
       <li><xsl:choose>
@@ -104,6 +101,7 @@
     <xsl:if test="string-length($letters-todo) &gt; 1">
       <xsl:call-template name="dindex-of-letter">
         <xsl:with-param name="letters-todo" select="substring($letters-todo,2)"/>
+        <xsl:with-param name="directives" select="$directives"/>
       </xsl:call-template>
     </xsl:if>
 
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index 4a8048acd1..34a737f031 100644
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -30,7 +30,7 @@
           </h2>
 
           <dl>
-            <xsl:for-each select="document(modulefilelist/modulefile)/modulesynopsis">
+            <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis">
               <xsl:sort select="name"/>
 
               <xsl:if test="status='MPM' or status='Core'">
@@ -56,7 +56,7 @@
           </h2>
             
           <dl>
-            <xsl:for-each select="document(modulefilelist/modulefile)/modulesynopsis">
+            <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis">
               <xsl:sort select="name"/>
                 
               <xsl:if test="status!='MPM' and status!='Core'">
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index cae19877be..3949c8baaa 100644
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -28,11 +28,15 @@
 
         <div id="directive-ref">
 
+         <xsl:variable name="directives" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)]"/>
+
           <!-- first collect the start letters -->
           <xsl:variable name="start-letters">
-            <xsl:call-template name="directive-startletters"/>
+            <xsl:call-template name="directive-startletters">
+              <xsl:with-param name="directives" select="$directives"/>
+            </xsl:call-template>
           </xsl:variable>
-
+          
           <table id="legend">
             <tr>
               <td class="letters"><span>
@@ -62,6 +66,7 @@
             <xsl:call-template name="reference-of-letter">
               <xsl:with-param name="letters-todo" select="$start-letters"/>
               <xsl:with-param name="offset" select="number(0)"/>
+              <xsl:with-param name="directives" select="$directives"/>
             </xsl:call-template>
           </table>
 
@@ -81,10 +86,11 @@
   <xsl:template name="reference-of-letter">
   <xsl:param name="letters-todo"/>
   <xsl:param name="offset"/>
+  <xsl:param name="directives"/>
 
     <xsl:variable name="letter" select="substring($letters-todo,1,1)"/>
 
-    <xsl:for-each select="document(/*/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)][$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]">
+    <xsl:for-each select="$directives[$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]">
     <xsl:sort select="name"/>
 
       <!-- create the content -->
@@ -160,7 +166,8 @@
     <xsl:if test="string-length($letters-todo) &gt; 1">
       <xsl:call-template name="reference-of-letter">
         <xsl:with-param name="letters-todo" select="substring($letters-todo,2)"/>
-        <xsl:with-param name="offset" select="(count(document(/*/modulefilelist/modulefile)/modulesynopsis/directivesynopsis[not(@location)][$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]) + $offset) mod 2"/>
+        <xsl:with-param name="offset" select="(count($directives[$letter=translate(substring(normalize-space(name),1,1),$lowercase,$uppercase)]) + $offset) mod 2"/>
+        <xsl:with-param name="directives" select="$directives"/>
       </xsl:call-template>
     </xsl:if>
 
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index 09f9b1eaac..8707061169 100644
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -12,7 +12,7 @@
   <!-- <sitemap>                                          -->
   <!-- Process an entire document into an HTML page       -->
   <!--                                                    -->
-  <xsl:template match="sitemap">
+  <xsl:template match="/sitemap">
     <html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
       <xsl:call-template name="head"/>
 
@@ -102,11 +102,15 @@
       </li>
     </xsl:if>
 
-    <xsl:if test="@separate='no'">
+    <xsl:if test="not(@separate='yes')">
       <li>
         <xsl:copy-of select="$link"/>
       </li>
     </xsl:if>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
   </xsl:template>
   <!-- /category/page -->
 
@@ -183,6 +187,10 @@
               </xsl:otherwise></xsl:choose>
             </a>
           </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
         </xsl:if>
       </xsl:for-each>
       <!-- /core,mpm -->
@@ -199,6 +207,10 @@
               <xsl:value-of select="$current/name"/>
             </a>
           </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
         </xsl:if>
       </xsl:for-each>
       <!-- /other modules -->
-- 
2.50.1