From: Eric Covener <covener@apache.org>
Date: Sat, 17 Nov 2012 03:00:25 +0000 (+0000)
Subject: xform
X-Git-Tag: 2.5.0-alpha~6109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a7416ea962f1cae7a21fe6924e7536cd764041;p=thirdparty%2Fapache%2Fhttpd.git

xform


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

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index f588aca4693..34fc88e0ece 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -926,6 +926,14 @@ later</td></tr>
       </div>
       </dd>
 
+      <dt><code>MergeBase</code></dt>
+      <dd>
+
+      <p>With this option, the value of <code class="directive"><a href="#rewritebase">RewriteBase</a></code> is copied from where it's explicitly defined
+      into any sub-directory or sub-location that doesn't define its own
+      <code class="directive"><a href="#rewritebase">RewriteBase</a></code>. Available in 
+      Apache HTTP Server 2.5 and later only.</p>
+      </dd>
       </dl>