add some links

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

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index e6e9ccffa5c42c8a5f2e4475cdd407950832c442..55ece1af922c8bbd3cca51c5d9a5853ce86775e8 100644 (file)
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -133,7 +133,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <table class="bordered"><tr class="header"><th>Name</th><th>Description</th></tr>
 <tr><td><code>REQUEST_METHOD</code></td>
-        <td>The HTTP method of the incoming request</td></tr>
+        <td>The HTTP method of the incoming request (e.g.
+            <code>GET</code></td></tr>
 <tr class="odd"><td><code>REQUEST_SCHEME</code></td>
         <td>The scheme part of the request's URI</td></tr>
 <tr><td><code>REQUEST_URI</code></td>
@@ -161,22 +162,27 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 <tr><td><code>REMOTE_IDENT</code></td>
         <td>The user name set by <code class="module"><a href="./mod/mod_ident.html">mod_ident</a></code></td></tr>
 <tr class="odd"><td><code>SERVER_NAME</code></td>
-        <td>The server name of the current vhost</td></tr>
+        <td>The <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> of
+            the current vhost</td></tr>
 <tr><td><code>SERVER_PORT</code></td>
-        <td>The server port of the current vhost</td></tr>
-<tr class="odd"><td><code>SERVER_PROTOCOL</code></td>
+        <td>The server port of the current vhost, see
+            <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code></td></tr>
+<tr class="odd"><td><code>SERVER_ADMIN</code></td>
+        <td>The <code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code> of
+            the current vhost</td></tr>
+<tr><td><code>SERVER_PROTOCOL</code></td>
         <td>The protocol used by the request</td></tr>
-<tr><td><code>SERVER_ADMIN</code></td>
-        <td>The server admin of the current vhost</td></tr>
 <tr class="odd"><td><code>DOCUMENT_ROOT</code></td>
         <td>The <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> of
             the current vhost</td></tr>
 <tr><td><code>AUTH_TYPE</code></td>
-        <td>The configured auth type (e.g. "<code>basic</code>")</td></tr>
+        <td>The configured <code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code>
+            (e.g. "<code>basic</code>")</td></tr>
 <tr class="odd"><td><code>CONTENT_TYPE</code></td>
         <td>The content type of the response</td></tr>
 <tr><td><code>HANDLER</code></td>
-        <td>The name of the handler creating the response</td></tr>
+        <td>The name of the <a href="handler.htmll">handler</a> creating
+            the response</td></tr>
 <tr class="odd"><td><code>HTTPS</code></td>
         <td>"<code>on</code>" if the request uses https,
             "<code>off</code>" otherwise</td></tr>

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index e137c88f7bb3fa9d0da1a29dfd766769a6d06e0f..133c8a3a44bbf041e1f6c6b67398f498bae61b3d 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -136,7 +136,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <tr><th>Name</th><th>Description</th></tr>
     <tr><td><code>REQUEST_METHOD</code></td>
-        <td>The HTTP method of the incoming request</td></tr>
+        <td>The HTTP method of the incoming request (e.g.
+            <code>GET</code></td></tr>
     <tr><td><code>REQUEST_SCHEME</code></td>
         <td>The scheme part of the request's URI</td></tr>
     <tr><td><code>REQUEST_URI</code></td>
@@ -164,22 +165,27 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     <tr><td><code>REMOTE_IDENT</code></td>
         <td>The user name set by <module>mod_ident</module></td></tr>
     <tr><td><code>SERVER_NAME</code></td>
-        <td>The server name of the current vhost</td></tr>
+        <td>The <directive module="core">ServerName</directive> of
+            the current vhost</td></tr>
     <tr><td><code>SERVER_PORT</code></td>
-        <td>The server port of the current vhost</td></tr>
+        <td>The server port of the current vhost, see
+            <directive module="core">ServerName</directive></td></tr>
+    <tr><td><code>SERVER_ADMIN</code></td>
+        <td>The <directive module="core">ServerAdmin</directive> of
+            the current vhost</td></tr>
     <tr><td><code>SERVER_PROTOCOL</code></td>
         <td>The protocol used by the request</td></tr>
-    <tr><td><code>SERVER_ADMIN</code></td>
-        <td>The server admin of the current vhost</td></tr>
     <tr><td><code>DOCUMENT_ROOT</code></td>
         <td>The <directive module="core">DocumentRoot</directive> of
             the current vhost</td></tr>
     <tr><td><code>AUTH_TYPE</code></td>
-        <td>The configured auth type (e.g. "<code>basic</code>")</td></tr>
+        <td>The configured <directive module="mod_authn_core">AuthType</directive>
+            (e.g. "<code>basic</code>")</td></tr>
     <tr><td><code>CONTENT_TYPE</code></td>
         <td>The content type of the response</td></tr>
     <tr><td><code>HANDLER</code></td>
-        <td>The name of the handler creating the response</td></tr>
+        <td>The name of the <a href="handler.htmll">handler</a> creating
+            the response</td></tr>
     <tr><td><code>HTTPS</code></td>
         <td>"<code>on</code>" if the request uses https,
             "<code>off</code>" otherwise</td></tr>

diff --git a/docs/manual/index.html.en b/docs/manual/index.html.en
index d6ac191cada171577654e92f30d8131cce7cffb0..593a57ac83a63a27c6b4c3eb56b85853f0b09b57 100644 (file)
--- a/docs/manual/index.html.en
+++ b/docs/manual/index.html.en
@@ -50,6 +50,7 @@ Documentation</h1>
 <li><a href="mpm.html">Multi-Processing Modules (MPMs)</a></li>
 <li><a href="filter.html">Filters</a></li>
 <li><a href="handler.html">Handlers</a></li>
+<li><a href="expr.html">Expression parser</a></li>
 <li><a href="programs/">Server and Supporting Programs</a></li>
 <li><a href="glossary.html">Glossary</a></li>
 </ul>

diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index 58d0cc279fcc6215a9f588c3250243d9e118a7a0..9e53bf8616f7f6f6a68cc6f04f963cb3a878ba28 100644 (file)
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -44,6 +44,7 @@ Documentation</title>
     <page href="mpm.html">Multi-Processing Modules (MPMs)</page>
     <page href="filter.html">Filters</page>
     <page href="handler.html">Handlers</page>
+    <page href="expr.html">Expression parser</page>
     <page href="programs/">Server and Supporting Programs</page>
     <page href="glossary.html">Glossary</page>
 </category>