Bring some more files into line with the new DTD.

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

13 files changed, 97 insertions, 88 deletions

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 2eb6527b2d..dbc404f20f 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
 <name>core</name>
-<status>Core</status>
 <description>Core Apache HTTP Server features that are always
 available</description>
+<status>Core</status>
 
 <directivesynopsis>
 <name>AcceptPathInfo</name>
@@ -114,10 +114,11 @@ AccessFileName .acl
 <description>Specifies the default character set to be added for a
 response without an explicit character set</description>
 <syntax>AddDefaultCharset On|Off|<em>charset</em></syntax>
+<default>AddDefaultCharset Off</default>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
-<default>AddDefaultCharset Off</default>
+
 
 <usage>
 
@@ -294,7 +295,8 @@ authentication</description>
 <description>Selects the type of user authentication</description>
 <syntax>AuthType Basic|Digest</syntax>
 <contextlist><context>directory</context><context>.htaccess</context>
-<override>AuthConfig</override></contextlist>
+</contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>This directive selects the type of user authentication for a
@@ -377,8 +379,8 @@ server cannot determine a type in any other way</description>
 <example>
       <code>DefaultType image/gif</code>
 </example>
-    would be appropriate for a directory which contained many gif
-    images with filenames missing the .gif extension. 
+    <p>would be appropriate for a directory which contained many gif
+    images with filenames missing the .gif extension.</p>
 
     <p>Note that unlike <directive
     module="core">ForceType</directive>, this directive is only
@@ -421,8 +423,8 @@ named file-system directory and sub-directories</description>
 <example>
    &lt;Directory ~ "^/www/.*/[0-9]{3}"&gt;
 </example>
-    would match directories in /www/ that consisted of three
-    numbers. 
+    <p>would match directories in /www/ that consisted of three
+    numbers.</p>
 
     <p>If multiple (non-regular expression) directory sections
     match the directory (or its parents) containing a document,
@@ -470,7 +472,7 @@ named file-system directory and sub-directories</description>
     <code>/home/abc/public_html/abc</code> and be applied.</p>
 
    <p><strong>Note that the default Apache access for
-    &lt;Directory /&gt; is <samp>Allow from All</samp>. This means
+    &lt;Directory /&gt; is <code>Allow from All</code>. This means
     that Apache will serve any file mapped from an URL. It is
     recommended that you change this with a block such
     as</strong></p>
@@ -689,17 +691,17 @@ HTTP response header</description>
     FileETag directive allows you to choose which of these -- if any
     -- should be used.  The recognized keywords are:
     </p>
-    <dl compact="compact">
-     <dt><b>INode</b></dt>
+    <dl>
+     <dt><strong>INode</strong></dt>
      <dd>The file's i-node number will be included in the calculation</dd>
-     <dt><b>MTime</b></dt>
+     <dt><strong>MTime</strong></dt>
      <dd>The date and time the file was last modified will be included</dd>
-     <dt><b>Size</b></dt>
+     <dt><strong>Size</strong></dt>
      <dd>The number of bytes in the file will be included</dd>
-     <dt><b>All</b></dt>
+     <dt><strong>All</strong></dt>
      <dd>All available fields will be used (equivalent to
       '<code>FileETag&nbsp;INode&nbsp;MTime&nbsp;Size</code>')</dd>
-     <dt><b>None</b></dt>
+     <dt><strong>None</strong></dt>
      <dd>If a document is file-based, no ETag field will be included in the
       response</dd>
     </dl>
@@ -1456,16 +1458,16 @@ matching URLs</description>
 
     <table>
       <tr>
-        <th align="LEFT"><strong>Level</strong> </th>
+        <th><strong>Level</strong> </th>
 
-        <th align="LEFT"><strong>Description</strong> </th>
+        <th><strong>Description</strong> </th>
       </tr>
 
       <tr>
         <th>
         </th>
 
-        <th align="LEFT"><strong>Example</strong> </th>
+        <th><strong>Example</strong> </th>
       </tr>
 
       <tr>
@@ -1844,7 +1846,7 @@ a resource</description>
 by Apache children</description>
 <syntax>RLimitCPU <em>number</em>|max [<em>number</em>|max]</syntax>
 <default>Unset; uses operating system defaults</default>
-<contextlist>><context>server config</context><context>virtual host</context>
+<contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 <compatibility>Moved in version 2.0 to
     the <a href="../mpm.html">MPMs</a></compatibility>
@@ -2141,13 +2143,13 @@ is accessed by an incompatible browser</description>
     mod_info output, ...). The reason why you would want to enable
     such a footer line is that in a chain of proxies, the user often
     has no possibility to tell which of the chained servers actually
-    produced a returned error message.<br /> The <samp>Off</samp>
+    produced a returned error message.<br /> The <code>Off</code>
     setting, which is the default, suppresses the error line (and is
     therefore compatible with the behavior of Apache-1.2 and
-    below). The <samp>On</samp> setting simply adds a line with the
+    below). The <code>On</code> setting simply adds a line with the
     server version number and <directive
     module="core">ServerName</directive> of the serving virtual host,
-    and the <samp>EMail</samp> setting additionally creates a
+    and the <code>EMail</code> setting additionally creates a
     "mailto:" reference to the <directive
     module="core">ServerAdmin</directive> of the referenced
     document.</p>
@@ -2162,7 +2164,7 @@ is accessed by an incompatible browser</description>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-    <p>This directive controls whether <samp>Server</samp> response
+    <p>This directive controls whether <code>Server</code> response
     header field which is sent back to clients includes a
     description of the generic OS-type of the server as well as
     information about compiled-in modules.</p>
@@ -2170,23 +2172,23 @@ is accessed by an incompatible browser</description>
     <dl>
       <dt><code>ServerTokens Prod[uctOnly]</code></dt>
 
-      <dd>Server sends (<em>e.g.</em>): <samp>Server:
-      Apache</samp></dd>
+      <dd>Server sends (<em>e.g.</em>): <code>Server:
+      Apache</code></dd>
 
       <dt><code>ServerTokens Min[imal]</code></dt>
 
-      <dd>Server sends (<em>e.g.</em>): <samp>Server:
-      Apache/1.3.0</samp></dd>
+      <dd>Server sends (<em>e.g.</em>): <code>Server:
+      Apache/1.3.0</code></dd>
 
       <dt><code>ServerTokens OS</code></dt>
 
-      <dd>Server sends (<em>e.g.</em>): <samp>Server: Apache/1.3.0
-      (Unix)</samp></dd>
+      <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/1.3.0
+      (Unix)</code></dd>
 
       <dt><code>ServerTokens Full</code> (or not specified)</dt>
 
-      <dd>Server sends (<em>e.g.</em>): <samp>Server: Apache/1.3.0
-      (Unix) PHP/3.0 MyMod/1.2</samp></dd>
+      <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/1.3.0
+      (Unix) PHP/3.0 MyMod/1.2</code></dd>
     </dl>
 
     <p>This setting applies to the entire server, and cannot be
@@ -2405,9 +2407,10 @@ hostname or IP address</description>
       <li>A fully qualified domain name for the IP address of the
       virtual host.</li>
     </ul>
-    Example: 
+    
 
-<example>&lt;VirtualHost 10.1.2.3&gt;<br />
+<example><title>Example</title>
+       &lt;VirtualHost 10.1.2.3&gt;<br />
        ServerAdmin webmaster@host.foo.com<br />
        DocumentRoot /www/docs/host.foo.com<br />
        ServerName host.foo.com<br />
diff --git a/docs/manual/mod/mod_asis.xml b/docs/manual/mod/mod_asis.xml
index 171e2b6681..7fe01a05fc 100644
--- a/docs/manual/mod/mod_asis.xml
+++ b/docs/manual/mod/mod_asis.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_auth.xml b/docs/manual/mod/mod_auth.xml
index 2bde9f139c..4ccd989c6a 100644
--- a/docs/manual/mod/mod_auth.xml
+++ b/docs/manual/mod/mod_auth.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_auth_anon.xml b/docs/manual/mod/mod_auth_anon.xml
index 7434ca5472..75dc933f90 100644
--- a/docs/manual/mod/mod_auth_anon.xml
+++ b/docs/manual/mod/mod_auth_anon.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_auth_dbm.xml b/docs/manual/mod/mod_auth_dbm.xml
index 6d50bcec67..04dad01a73 100644
--- a/docs/manual/mod/mod_auth_dbm.xml
+++ b/docs/manual/mod/mod_auth_dbm.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml
index 3d3c544278..ac1e9365e2 100644
--- a/docs/manual/mod/mod_auth_digest.xml
+++ b/docs/manual/mod/mod_auth_digest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 <name>mod_auth_digest</name>
diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 73aeb7dcc6..3b6e443e95 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 <name>mod_autoindex</name>
@@ -50,7 +50,7 @@
     same header repeatedly toggles between ascending and descending
     order. These column header links are suppressed with
     <directive module="autoindex">IndexOptions</directive> directive's
-    <samp>SuppressColumnSorting</samp> option.</p>
+    <code>SuppressColumnSorting</code> option.</p>
 
     <p>Note that when the display is sorted by "Size", it's the
     <em>actual</em> size of the files that's used, not the
@@ -73,41 +73,41 @@
     resource.</p>
 
     <ul>
-      <li><samp>C=N</samp> sorts the directory by file name</li>
+      <li><code>C=N</code> sorts the directory by file name</li>
 
-      <li><samp>C=M</samp> sorts the directory by last-modified
+      <li><code>C=M</code> sorts the directory by last-modified
       date, then file name</li>
 
-      <li><samp>C=S</samp> sorts the directory by size, then file
+      <li><code>C=S</code> sorts the directory by size, then file
       name</li>
 
-      <li><samp>C=D</samp> sorts the directory by description, then
+      <li><code>C=D</code> sorts the directory by description, then
       file name<br />
        &nbsp;</li>
 
-      <li><samp>O=A</samp> sorts the listing in Ascending
+      <li><code>O=A</code> sorts the listing in Ascending
       Order</li>
 
-      <li><samp>O=D</samp> sorts the listing in Descending
+      <li><code>O=D</code> sorts the listing in Descending
       Order<br />
        &nbsp;</li>
 
-      <li><samp>F=0</samp> formats the listing as a simple list
+      <li><code>F=0</code> formats the listing as a simple list
       (not FancyIndexed)</li>
 
-      <li><samp>F=1</samp> formats the listing as a FancyIndexed
+      <li><code>F=1</code> formats the listing as a FancyIndexed
       list</li>
 
-      <li><samp>F=2</samp> formats the listing as an HTMLTable
+      <li><code>F=2</code> formats the listing as an HTMLTable
       FancyIndexed list<br />
        &nbsp;</li>
 
-      <li><samp>V=0</samp> disables version sorting</li>
+      <li><code>V=0</code> disables version sorting</li>
 
-      <li><samp>V=1</samp> enables version sorting<br />
+      <li><code>V=1</code> enables version sorting<br />
        &nbsp;</li>
 
-      <li><samp>P=<em>pattern</em></samp> lists only files matching
+      <li><code>P=<em>pattern</em></code> lists only files matching
       the given <em>pattern</em></li>
     </ul>
 
@@ -479,7 +479,7 @@ indexing</description>
     of</p>
 
     <dl>
-      <dt><a id="indexoptions:descriptionwidth"
+      <dt><a
       name="indexoptions:descriptionwidth">DescriptionWidth=[<em>n</em>
       | *] (<em>Apache 1.3.10 or 2.0.23 and later</em>)</a></dt>
 
@@ -497,22 +497,22 @@ indexing</description>
       width necessary to accommodate the longest description
       string.</dd>
 
-      <dd><b>See the section on <directive
+      <dd><strong>See the section on <directive
       module="mod_autoindex">AddDescription</directive> for dangers
-      inherent in truncating descriptions.</b></dd>
+      inherent in truncating descriptions.</strong></dd>
 
-      <dt><a id="indexoptions:fancyindexing"
+      <dt><a 
       name="indexoptions:fancyindexing">FancyIndexing</a></dt>
 
       <dd>
       This turns on fancy indexing of directories.</dd>
 
-      <dt><a id="indexoptions:foldersfirst"
-      name="indexoptions:foldersfirst">FoldersFirst (<i>Apache
-      1.3.10 or 2.0.23 and later</i>)</a></dt>
+      <dt><a 
+      name="indexoptions:foldersfirst">FoldersFirst (<em>Apache
+      1.3.10 or 2.0.23 and later</em>)</a></dt>
 
       <dd>If this option is enabled, subdirectory listings will
-      <i>always</i> appear first, followed by normal files in the
+      <em>always</em> appear first, followed by normal files in the
       directory. The listing is basically broken into two
       components, the files and the subdirectories, and each is
       sorted separately and then displayed subdirectories-first.
@@ -520,14 +520,14 @@ indexing</description>
       <code>FoldersFirst</code> is enabled, subdirectory
       <code>Zed</code> will be listed before subdirectory
       <code>Beta</code>, which will be listed before normal files
-      <code>Gamma</code> and <code>Alpha</code>. <b>This option
+      <code>Gamma</code> and <code>Alpha</code>. <strong>This option
       only has an effect if <a
       href="#indexoptions:fancyindexing"><code>FancyIndexing</code></a>
-      is also enabled.</b></dd>
+      is also enabled.</strong></dd>
 
-      <dt><a id="indexoptions:htmltable"
-      name="indexoptions:htmltable">HTMLTable</a> <i>(Experimental,
-      Apache 2.0.23 and later)</i></dt>
+      <dt><a 
+      name="indexoptions:htmltable">HTMLTable</a> <em>(Experimental,
+      Apache 2.0.23 and later)</em></dt>
 
       <dd>
       This experimental option with FancyIndexing constructs a
@@ -537,14 +537,14 @@ indexing</description>
       left-to-right and right-to-left reading order, as can happen
       on WinNT or other utf-8 enabled platforms.</dd>
 
-      <dt><a id="indexoptions:iconsarelinks"
+      <dt><a 
       name="indexoptions:iconsarelinks">IconsAreLinks</a></dt>
 
       <dd>
       This makes the icons part of the anchor for the filename, for
       fancy indexing.</dd>
 
-      <dt><a id="indexoptions:iconheight"
+      <dt><a 
       name="indexoptions:iconheight">IconHeight[=pixels]
       (<em>Apache 1.3 and later</em>)</a></dt>
 
@@ -558,7 +558,7 @@ indexing</description>
       the standard height of the icons supplied with the Apache
       software.</dd>
 
-      <dt><a id="indexoptions:iconwidth"
+      <dt><a 
       name="indexoptions:iconwidth">IconWidth[=pixels] (<em>Apache
       1.3 and later</em>)</a></dt>
 
@@ -572,7 +572,7 @@ indexing</description>
       the standard width of the icons supplied with the Apache
       software.</dd>
 
-      <dt><a id="indexoptions:ignoreclient"
+      <dt><a 
       name="indexoptions:ignoreclient">IgnoreClient</a></dt>
 
       <dd>
@@ -581,7 +581,7 @@ indexing</description>
       <code><a
       href="#indexoptions:suppresscolumnsorting">SuppressColumnSorting</a></code>.)</dd>
 
-      <dt><a id="indexoptions:namewidth"
+      <dt><a 
       name="indexoptions:namewidth">NameWidth=[<em>n</em> | *]
       (<em>Apache 1.3.2 and later</em>)</a></dt>
 
@@ -597,8 +597,7 @@ indexing</description>
       <dd><code>NameWidth=*</code> grows the column to the
       necessary width.</dd>
 
-      <dt><a id="indexoptions:scanhtmltitles"
-      name="indexoptions:scanhtmltitles">ScanHTMLTitles</a></dt>
+      <dt><a       name="indexoptions:scanhtmltitles">ScanHTMLTitles</a></dt>
 
       <dd>
       This enables the extraction of the title from HTML documents
@@ -607,7 +606,7 @@ indexing</description>
       httpd will read the document for the value of the TITLE tag.
       This is CPU and disk intensive.</dd>
 
-      <dt><a id="indexoptions:suppresscolumnsorting"
+      <dt><a 
       name="indexoptions:suppresscolumnsorting">SuppressColumnSorting</a>
       (<em>Apache 1.3 and later</em>)</dt>
 
@@ -622,7 +621,7 @@ indexing</description>
       href="#indexoptions:ignoreclient">IndexOptions
       IgnoreClient</a> in Apache 2.0.23.</dd>
 
-      <dt><a id="indexoptions:suppressdescription"
+      <dt><a 
       name="indexoptions:suppressdescription">SuppressDescription</a></dt>
 
       <dd>
@@ -637,7 +636,7 @@ indexing</description>
       index option to limit the size of the description
       column.</dd>
 
-      <dt><a id="indexoptions:suppresshtmlpreamble"
+      <dt><a 
       name="indexoptions:suppresshtmlpreamble">SuppressHTMLPreamble</a>
       (<em>Apache 1.3 and later</em>)</dt>
 
@@ -652,7 +651,7 @@ indexing</description>
       HTML instructions in this case. If there is no header file, the
       preamble is generated as usual.</dd>
 
-      <dt><a id="indexoptions:suppressicon"
+      <dt><a 
       name="indexoptions:suppressicon">SuppressIcon</a> (<em>Apache
       2.0.23 and later</em>)</dt>
 
@@ -663,14 +662,14 @@ indexing</description>
       by the final specification prohibits IMG and HR tags from the
       PRE block (used to format FancyIndexed listings.)</dd>
 
-      <dt><a id="indexoptions:suppresslastmodified"
+      <dt><a 
       name="indexoptions:suppresslastmodified">SuppressLastModified</a></dt>
 
       <dd>
       This will suppress the display of the last modification date,
       in fancy indexing listings.</dd>
 
-      <dt><a id="indexoptions:suppressrules"
+      <dt><a 
       name="indexoptions:suppressrules">SuppressRules</a>
       (<em>Apache 2.0.23 and later</em>)</dt>
 
@@ -681,14 +680,14 @@ indexing</description>
       by the final specification prohibits IMG and HR tags from the
       PRE block (used to format FancyIndexed listings.)</dd>
 
-      <dt><a id="indexoptions:suppresssize"
+      <dt><a 
       name="indexoptions:suppresssize">SuppressSize</a></dt>
 
       <dd>
       This will suppress the file size in fancy indexing
       listings.</dd>
 
-      <dt><a id="indexoptions:trackmodified"
+      <dt><a 
       name="indexoptions:trackmodified">TrackModified (<em>Apache
       1.3.15 or 2.0.23 and later</em>)</a></dt>
 
@@ -707,7 +706,7 @@ indexing</description>
       Last-Modified header on all Unix platforms.</strong> If this
       is a concern, leave this option disabled.</dd>
 
-      <dt><a id="indexoptions:versionsort"
+      <dt><a 
       name="indexoptions:versionsort">VersionSort (<em>Apache 2.0a3
       and later</em>)</a></dt>
 
@@ -738,7 +737,7 @@ foo-1.04
       </dd>
 
       <dd>
-        <h3>Incremental IndexOptions</h3>
+        <strong>Incremental IndexOptions</strong>
       </dd>
 
       <dd>
diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml
index 4c3ea9c1ef..9e1c4cf02e 100644
--- a/docs/manual/mod/mod_cgi.xml
+++ b/docs/manual/mod/mod_cgi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index bebea4f7c3..7766be6c83 100644
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_charset_lite.xml b/docs/manual/mod/mod_charset_lite.xml
index b047e85200..df9f847058 100644
--- a/docs/manual/mod/mod_charset_lite.xml
+++ b/docs/manual/mod/mod_charset_lite.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
@@ -86,8 +87,8 @@
     as a valid character set name by the character set support in
     APR. Generally, this means that it must be supported by
     iconv.</p>
-    Example: 
-<example>
+    
+<example><title>example</title>
     &lt;Directory "/export/home/trawick/apacheinst/htdocs/convert"&gt;<br />
     CharsetSourceEnc  UTF-16BE<br />
     CharsetDefault    ISO8859-1<br />
@@ -117,8 +118,8 @@
     as a valid character set name by the character set support in
     APR. Generally, this means that it must be supported by
     iconv.</p>
-    Example: 
-<example>
+
+<example><title>Example</title>
     &lt;Directory "/export/home/trawick/apacheinst/htdocs/convert"&gt;<br />
     CharsetSourceEnc  UTF-16BE<br />
     CharsetDefault    ISO8859-1<br />
@@ -131,8 +132,8 @@
 <name>CharsetOptions</name>
 <description>Configures charset tranlation behavior</description>
 <syntax>CharsetOptions <em>option</em> [<em>option</em>] ...</syntax>
-<default>CharsetOptions <em>DebugLevel=0</em> 
-<em>NoImplicitAdd</em></default>
+<default>CharsetOptions DebugLevel=0 
+NoImplicitAdd</default>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context>
diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
index 59a4283561..a8908f7ddd 100644
--- a/docs/manual/mod/mod_dav.xml
+++ b/docs/manual/mod/mod_dav.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
@@ -67,8 +67,8 @@
 </directivesynopsis>
 
 <directivesynopsis>
-<description>Location of the DAV lock database</description>
 <name>DavLockDB</name>
+<description>Location of the DAV lock database</description>
 <syntax>DavLockDB <em>file-path</em></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index 44b5efda36..cf5ff40d9b 100644
--- a/docs/manual/mod/mod_deflate.xml
+++ b/docs/manual/mod/mod_deflate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xml:manual [ <!ENTITY nbsp "&#160;"> ]>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>
 
diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml
index a502fb5745..933a23c3a7 100644
--- a/docs/manual/mod/mod_env.xml
+++ b/docs/manual/mod/mod_env.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.xsl"?>
 <modulesynopsis>