- Add some <columspec> table-size hints

- Remove some <br>s where they really shouldn't be

- Reorder the sitemap slightly (indexes at the end)

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

diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index b1c020ef637395a216b0d99608dbc8e33e374b8f..d43f780fc0b6b9fe469b5acf235a7cc42eeb1a42 100644 (file)
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -242,6 +242,7 @@
 <section id="dimensions"><title>Dimensions of Negotiation</title>
 
     <table>
+      <columnspec><column width=".15"/><column width=".85"/></columnspec>
       <tr valign="top">
         <th>Dimension</th>
 
@@ -524,6 +525,8 @@ decimal places before choosing the best variant.</p>
     invalid hyperlinks:</p>
 
     <table border="1" cellpadding="8" cellspacing="0">
+      <columnspec><column width=".2"/><column width=".2"/>
+        <column width=".2"/></columnspec>
       <tr>
         <th>Filename</th>
 

diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 7d5ab49236f87c89e9c65acea0a328fb41611d6d..7c99530d265d6617c9e2544bcb985266a09fed5f 100644 (file)
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -30,6 +30,7 @@
     impatient</title>
 
     <table>
+      <columnspec><column width=".15"/><column width=".85"/></columnspec>
       <tr>
         <td><a href="#download">Download</a></td>
 

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 27f10b866066a5a8fbc72ea82328e10f498a6b2e..c167f484d2938d585501c96043636433d98662a8 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -907,8 +907,7 @@ in case of an error</description>
 <name>ErrorLog</name>
 <description>Location where the server will log errors</description>
 <syntax> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</syntax>
-<default>ErrorLog logs/error_log (Unix)<br />
-ErrorLog logs/error.log (Windows and OS/2)</default>
+<default>ErrorLog logs/error_log (Unix) ErrorLog logs/error.log (Windows and OS/2)</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 

diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml
index 9c85b9b4926e107d548fe7b2830d2b81400c6573..2ce998c298a289ce07109d3cf0efe8df9bf3193b 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml
+++ b/docs/manual/mod/mod_log_config.xml
@@ -44,6 +44,7 @@
     replaced in the log file by the values as follows:</p>
 
     <table border="1" style="zebra">
+    <columnspec><column width=".2"/><column width=".8"/></columnspec>
     <tr><th>Format&nbsp;String</th>
         <th>Description</th></tr>
 
@@ -157,6 +158,7 @@
         <td>Connection status when response is completed:
 
         <table>
+        <columnspec><column width=".2"/><column width=".6"/></columnspec>
         <tr><td><code>X</code> =</td>
             <td>connection aborted before the response completed.</td></tr>
         <tr><td><code>+</code> =</td>

diff --git a/docs/manual/mod/prefork.xml b/docs/manual/mod/prefork.xml
index 9eab2c0b49f1196a6cfd99b6981485507af8932c..e064c06310cab6429d4c8eaecae4549b95f19099 100644 (file)
--- a/docs/manual/mod/prefork.xml
+++ b/docs/manual/mod/prefork.xml
@@ -100,7 +100,7 @@ uses</a></seealso>
 <directivesynopsis>
 <name>MaxSpareServers</name>
 <description>Maximum number of idle child server processes</description>
-<syntax>MaxSpareServers <var>number</var><br /></syntax>
+<syntax>MaxSpareServers <var>number</var></syntax>
 <default>MaxSpareServers 10</default>
 <contextlist><context>server config</context></contextlist>
 

diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml
index 81ebfa5060f5278dab630201e6b651044b8e2f66..c886589eb74eef06af20de3b2f55be32fc1225c2 100644 (file)
--- a/docs/manual/mpm.xml
+++ b/docs/manual/mpm.xml
@@ -85,6 +85,7 @@ systems.  This will be the MPM selected if you do not make another
 choice at compile-time.</p>
 
 <table>
+<columnspec><column width=".2"/><column width=".2"/></columnspec>
 <tr><td>BeOS</td><td><module>beos</module></td></tr>
 <tr><td>Netware</td><td><module>mpm_netware</module></td></tr>
 <tr><td>OS/2</td><td><module>mpmt_os2</module></td></tr>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index c7cd853e4c3597aa10b9c4d60f063c1db52b8e9e..5e52a601d41f4f45db1a320e038f38c749af9d68 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -119,9 +119,8 @@ Server on HPUX</page>
 
 <category id="modules">
 <title>Apache modules</title>
-<page href="mod/">Module index</page>
-<page href="mod/directives.html">Directive index</page>
-<page href="mod/quickreference.html">Directive Quick-Reference</page>
+<page href="mod/module-dict.html">Definitions of terms used to describe Apache modules</page>
+<page href="mod/directive-dict.html">Definitions of terms used to describe Apache directives</page>
 &allmodules;
 </category>
 
@@ -137,12 +136,12 @@ Server on HPUX</page>
 <page href="developer/filters.html">How Filters Work in Apache 2.0</page>
 </category>
 
-<category id="descriptive">
-<title>Descriptive Information</title>
-<page href="mod/module-dict.html">Definitions of terms used to describe Apache modules</page>
-<page href="mod/directive-dict.html">Definitions of terms used to describe Apache directives</page>
+<category id="index">
+<title>Glossary and Index</title>
 <page href="glossary.html">Glossary</page>
-<page>Sitemap (this document)</page>
+<page href="mod/">Module index</page>
+<page href="mod/directives.html">Directive index</page>
+<page href="mod/quickreference.html">Directive Quick-Reference</page>
 </category>
 
 </sitemap>

diff --git a/docs/manual/ssl/ssl_compat.xml b/docs/manual/ssl/ssl_compat.xml
index 8e2ab030fdf3fb2f4f4a585b06b291c2db53b946..7da29d4d89e1821eba3bd5210cb0c26ac227073c 100644 (file)
--- a/docs/manual/ssl/ssl_compat.xml
+++ b/docs/manual/ssl/ssl_compat.xml
@@ -50,6 +50,8 @@ provide.</p>
 <section id="table1">
 <title>Table 1: Configuration Directive Mapping</title>
 <table style="zebra">
+<columnspec><column width=".32"/><column width=".32"/>
+<column width=".32"/></columnspec>
 <tr><th>Old Directive</th><th>mod_ssl Directive</th><th>Comment</th></tr>
 
 <tr><th colspan="3">Apache-SSL 1.x &amp; mod_ssl 2.0.x compatibility:</th></tr>
@@ -130,6 +132,8 @@ href="#table2">Table 2</a>.</p>
 <section id="table2">
 <title>Table 2: Environment Variable Derivation</title>
 <table style="zebra">
+<columnspec><column width=".38"/><column width=".38"/>
+<column width=".2"/></columnspec>
 <tr><th>Old Variable</th><th>mod_ssl Variable</th><th>Comment</th></tr>
 
 <tr><td><code>SSL_PROTOCOL_VERSION</code></td><td><code>SSL_PROTOCOL</code></td><td>renamed</td></tr>
@@ -229,6 +233,7 @@ are listed in <a href="#table3">Table 3</a>.</p>
 <section id="table3">
 <title>Table 3: Custom Log Cryptography Function</title>
 <table>
+<columnspec><column width=".2"/><column width=".4"/></columnspec>
 <tr><th>Function Call</th><th>Description</th></tr>
 
 <tr><td><code>%...{version}c</code></td>   <td>SSL protocol version</td></tr>

diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index e68889696571527d05805992f98b34802c70dc78..e577be5079bbbfb8e9edc3ee82d6f20a21641ded 100644 (file)
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -419,7 +419,7 @@ server Certificate for it. How do I do it?</title>
              </a>
        </li>
        </ol>
-       <br />
+
        Second you can use your own CA and now have to sign the CSR yourself by
        this CA. Read the next answer in this FAQ on how to sign a CSR with
        your CA yourself.
@@ -893,15 +893,15 @@ server" What's the reason?</title>
         popular that it was already answered a lot of times in the past.
     </dd>
     <dt>Postings from the modssl-users Support Mailing List
-        <a href="http://www.modssl.org/support/">
-        http://www.modssl.org/support/</a></dt>
+        <a href="http://www.modssl.org/support/"
+        >http://www.modssl.org/support/</a></dt>
     <dd>Second search for your problem in one of the existing archives of the
         modssl-users mailing list. Perhaps your problem popped up at least once for
         another user, too.
     </dd>
-    <dt>Problem Reports in the Bug Database
-        <a href="http://www.modssl.org/support/bugdb/">
-        http://www.modssl.org/support/bugdb/</a></dt>
+    <dt>Problem Reports in the Bug Database <a 
+        href="http://www.modssl.org/support/bugdb/"
+        >http://www.modssl.org/support/bugdb/</a></dt>
     <dd>Third look inside the mod_ssl Bug Database. Perhaps
         someone else already has reported the problem.
     </dd>

diff --git a/docs/manual/ssl/ssl_intro.xml b/docs/manual/ssl/ssl_intro.xml
index dfe5c40b71707928305f4a7d6959d0447dc3bb0c..f774f3ec390c7fecf38692f8edb9d55f6e02ff22 100644 (file)
--- a/docs/manual/ssl/ssl_intro.xml
+++ b/docs/manual/ssl/ssl_intro.xml
@@ -166,6 +166,8 @@ certificates are used for authentication.</p>
     <section id="table1">
     <title>Table 1: Certificate Information</title>
     <table>
+    <columnspec><column width=".35"/><column width=".35"/>
+    </columnspec>
     <tr><th>Subject</th>
         <td>Distinguished Name, Public Key</td></tr>
     <tr><th>Issuer</th>
@@ -190,6 +192,8 @@ certificates are used for authentication.</p>
     <section id="table2">
     <title>Table 2: Distinguished Name Information</title>
     <table border="1">
+    <columnspec><column width=".25"/><column width=".15"/>
+      <column width=".3"/><column width=".25"/></columnspec>
     <tr><th>DN Field</th>
         <th>Abbrev.</th>
         <th>Description</th>
@@ -368,6 +372,8 @@ of establishing a protocol session.</p>
 <section id="table4">
 <title>Table 4: Versions of the SSL protocol</title>
     <table border="1">
+    <columnspec><column width=".15"/><column width=".2"/>
+     <column width=".30"/><column width=".25"/></columnspec>
     <tr><th>Version</th>
         <th>Source</th>
         <th>Description</th>