From 7b163966a7bc06d15eb48815ee5bd6096b1632de Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Thu, 6 Jan 2011 02:12:01 +0000
Subject: [PATCH] clarify RewriteBase as action for closed PR50546

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1055710 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_rewrite.html.en | 14 +++++++++-----
 docs/manual/mod/mod_rewrite.xml     | 10 +++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 136e629c49..cd4118dd26 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -113,16 +113,20 @@ URLs on the fly</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
 </table>
       <p>The <code class="directive">RewriteBase</code> directive explicitly
-      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites.
+      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites
+      that result in the substitution of a relative path.
       When you use a <code class="directive"><a href="#rewriterule">RewriteRule</a></code>
       in a <code>.htaccess</code> file, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> strips off
       the local directory prefix before processing, then rewrites the rest of 
       the URL. When the rewrite is completed, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-      automatically adds the local directory prefix back on to the path.</p>
+      automatically adds the local directory prefix (or the
+      <code class="directive">RewriteBase</code> when set) back on to the substitution 
+      before handing it back to the core of the server as if it were the original
+      URL.</p>
       
       <p>This directive is <em>required</em> for per-directory rewrites whose context
       is a directory made available via the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
-      directive.</p>
+      directive, when the substitution uses a relative path.</p>
 
       <p>If your URL path does not exist verbatim on the filesystem,
       or isn't directly under your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>,
@@ -896,7 +900,7 @@ later</td></tr>
 
 <div class="note"><h3>Per-directory Rewrites</h3>
 <ul>
-<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections, with some additional
+<li>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files and in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections, with some additional
 complexity.</li>
 
 <li>To enable the rewrite engine in this context, you need to set
@@ -920,7 +924,7 @@ relative substutions.</li>
 a <code class="directive">RewriteCond</code>.</li>
 
 <li>The removed prefix always ends with a slash, meaning the matching occurs against a string which
-<em>never</em> has a leading slash.  Therefore, A <em>Pattern</em> with <code>^/</code> never
+<em>never</em> has a leading slash.  Therefore, a <em>Pattern</em> with <code>^/</code> never
 matches in per-directory context.</li>
 
 <li>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> and <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections, this
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 19f2db22ea..fbca1dc83b 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -279,16 +279,20 @@ Apache HTTP Server 2.0.41 and later</compatibility>
 
 <usage>
       <p>The <directive>RewriteBase</directive> directive explicitly
-      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites.
+      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites
+      that result in the substitution of a relative path.
       When you use a <directive module="mod_rewrite">RewriteRule</directive>
       in a <code>.htaccess</code> file, <module>mod_rewrite</module> strips off
       the local directory prefix before processing, then rewrites the rest of 
       the URL. When the rewrite is completed, <module>mod_rewrite</module>
-      automatically adds the local directory prefix back on to the path.</p>
+      automatically adds the local directory prefix (or the
+      <directive>RewriteBase</directive> when set) back on to the substitution 
+      before handing it back to the core of the server as if it were the original
+      URL.</p>
       
       <p>This directive is <em>required</em> for per-directory rewrites whose context
       is a directory made available via the <directive module="mod_alias">Alias</directive>
-      directive.</p>
+      directive, when the substitution uses a relative path.</p>
 
       <p>If your URL path does not exist verbatim on the filesystem,
       or isn't directly under your <directive module="core">DocumentRoot</directive>,
-- 
2.40.0