From e006cdeed6853b7884fec4537ec9bea6bb0af7bc Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Tue, 24 Mar 2015 13:05:25 +0000
Subject: [PATCH] tweak version # (doc got backported prematurely) and fix
 typos.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1668874 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_rewrite.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 7229926346..99d8a406da 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -260,8 +260,22 @@ later</compatibility>
       default behavior in 2.4.0 through 2.4.3, and the flag to restore it is
       available Apache HTTP Server 2.4.4 and later.</p>
       </dd>
-      </dl>
 
+      <dt><code>IgnoreContextInfo</code></dt>
+      <dd>
+
+      <p>In versions 2.4.13 and later, when a relative substitution is made
+         in directory (htaccess) context and <directive module="mod_rewrite"
+         >RewriteBase</directive> has not been set, this module uses some
+         extended URL and filesystem context information to change the 
+         relative substitution back into a URL. Modules such as 
+         <module>mod_userdir</module> and <module>mod_alias</module>
+         supply this extended context info.  This option disables the behavior
+         introduced in 2.4.13 and should only be set if all of the conditions 
+         above are present and a substituion has an unexpected result.  </p>
+      </dd>
+
+      </dl>
 </usage>
 
 </directivesynopsis>
@@ -381,6 +395,10 @@ later</compatibility>
                <directive>RewriteRule</directive>, suffixed by the relative 
                substitution is also valid as a URL path on the server 
                (this is rare).</li>
+          <li> In Apache HTTP Server 2.4.13 and later, this directive may be 
+                omitted when the request is mapped via 
+                <directive module="mod_alias">Alias</directive>
+                or <module>mod_userdir</module>.</li>
       </ul>
 
 <p> In the example below, <directive>RewriteBase</directive> is necessary
@@ -390,13 +408,14 @@ later</compatibility>
     directory under the document root.</p>
 <highlight language="config">
 DocumentRoot /var/www/example.com
-Alias /myapp /opt/myapp-1.2.3
+AliasMatch ^/myapp /opt/myapp-1.2.3
 &lt;Directory /opt/myapp-1.2.3&gt;
     RewriteEngine On
     RewriteBase /myapp/
     RewriteRule ^index\.html$  welcome.html 
 &lt;/Directory&gt;
 </highlight>
+
 </usage>
 
 </directivesynopsis>
-- 
2.40.0