Bug 70017: Clarify substitution combinations table intro; fix per-server/per-director...

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

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 815653f14b06f3aa5464ac9a0c39ec7c137db3b9..63fdb80c245e41c64bff67ea355a2af45add7e31 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1542,11 +1542,11 @@ directive.</p>
 </note>
 
 
-     <p>Here are all possible substitution combinations and their
+     <p>Here are the possible combinations of substitution string
+      form, context, and the [R] and [P] flags, and their
       meanings:</p>
 
-      <p><strong>Inside per-server configuration
-      (<code>httpd.conf</code>)<br />
+      <p><strong>Outside <glossary ref="perdirectory">per-directory</glossary> configuration<br />
        for request ``<code>GET
       /somepath/pathinfo</code>'':</strong><br />
       </p>
@@ -1618,9 +1618,9 @@ directive.</p>
 </tr>
 </table>
 
-      <p><strong>Inside per-directory configuration for
+      <p><strong>Inside <glossary ref="perdirectory">per-directory</glossary> configuration for
       <code>/somepath</code><br />
-       (<code>/physical/path/to/somepath/.htaccess</code>, with
+       (e.g., <code>.htaccess</code> or <code>&lt;Directory&gt;</code>, with
       <code>RewriteBase "/somepath"</code>)<br />
        for request ``<code>GET
       /somepath/localpath/pathinfo</code>'':</strong><br />

diff --git a/docs/manual/rewrite/htaccess.xml b/docs/manual/rewrite/htaccess.xml
index d7008cc6c03a3f37195cd4ce24fc72dd6602e3ef..934fe5136e63cace8b1306cb86d2718bf60e65a8 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml
+++ b/docs/manual/rewrite/htaccess.xml
@@ -47,6 +47,7 @@ processes rules in per-directory context, see the
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 <seealso><a href="flags.html">RewriteRule Flags</a></seealso>
 <seealso><a href="tech.html">Technical details</a></seealso>
+<seealso><a href="../mod/mod_rewrite.html#what_is_matched">Substitution string combinations</a></seealso>
 
 <section id="prerequisites"><title>Prerequisites: AllowOverride</title>