Fix some really nasty markup in mod_ssl (well, just a work-around

really; the <pre> needs to be removed).

Add a missing faq section to the sitemap (my fault)

Add a columnspec to the quickreference.

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

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 5109dffe98ecdb012197eb526e8d98b6b0b9d0f6..5899388427008db3a9d37bdafdfc0dbfadaea073 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1108,8 +1108,8 @@ SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \<br />
             and %{TIME_HOUR} &gt;= 8 and %{TIME_HOUR} &lt;= 20       ) \<br />
            or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
 </example>
-<table border="1"><tr><td>
-<em>Standard CGI/1.0 and Apache variables:</em>
+
+<p><em>Standard CGI/1.0 and Apache variables:</em></p>
 <pre>
 HTTP_USER_AGENT        PATH_INFO             AUTH_TYPE
 HTTP_REFERER           QUERY_STRING          SERVER_SOFTWARE
@@ -1125,7 +1125,7 @@ REQUEST_SCHEME         REMOTE_ADDR           TIME
 REQUEST_URI            REMOTE_USER           ENV:<strong>variablename</strong>
 REQUEST_FILENAME
 </pre>
-<em>SSL-related variables:</em>
+<p><em>SSL-related variables:</em></p>
 <pre>
 HTTPS                  SSL_CLIENT_M_VERSION   SSL_SERVER_M_VERSION
                        SSL_CLIENT_M_SERIAL    SSL_SERVER_M_SERIAL
@@ -1165,7 +1165,6 @@ SSL_VERSION_INTERFACE  SSL_CLIENT_S_DN_OU     SSL_SERVER_S_DN_OU
                        SSL_CLIENT_CERT_CHAIN<strong>n</strong>
                        SSL_CLIENT_VERIFY
 </pre>
-</td></tr></table>
 </usage>
 </directivesynopsis>
 

diff --git a/docs/manual/mod/quickreference.xml b/docs/manual/mod/quickreference.xml
index 32744a82fbc498581d475b939b134b608b58e1cb..4106bbe1a59057493f87b1e50a1ef1ea161681be 100644 (file)
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -24,6 +24,7 @@
 
   <legend>
     <table>
+      <columnspec><column width=".1"/><column width=".2"/></columnspec>
       <tr><th>s</th><td>server&#160;config</td></tr>
       <tr><th>v</th><td>virtual&#160;host</td></tr>
       <tr><th>d</th><td>directory</td></tr>
@@ -31,6 +32,7 @@
     </table>
 
     <table>
+      <columnspec><column width=".1"/><column width=".2"/></columnspec>
       <tr><th>C</th><td>Core</td></tr>
       <tr><th>M</th><td>MPM</td></tr>
       <tr><th>B</th><td>Base</td></tr>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 5e52a601d41f4f45db1a320e038f38c749af9d68..8c0e1b046b406f40008076ce6b75ada606050667 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -59,8 +59,8 @@
 <category id="faq">
 <title>Apache Server Frequently Asked Questions</title>
 <page href="faq/">Overview</page>
-<page separate="yes" href="faq/all_in_one.html">All on One Page</page>
 <page href="faq/support.html">Support</page>
+<page href="faq/error.html">Error Messages</page>
 </category>
 
 <category id="ssl">