Merge r720955 from trunk:

Slight clarification to the way rewrite works in per-directory context.
Suggested by Peter Kehl on the users mailing list.

Reviewed by: rbowen, covener, takashi

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721621 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 5abe2dabf5fef6e97ed0481b5030f2f9f00ed71f..6a72c1bc41da417d6bfc0bd236dc7a6c12cbbe86 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -215,7 +215,9 @@ Result:
               correct Apache internal processing. Because the
               per-directory rewriting comes late in the
               process, the rewritten request
-              has to be re-injected into the Apache kernel. 
+              has to be re-injected into the Apache kernel, as if it
+              were a new request. (See <a href="../rewrite/rewrite_tech.html">mod_rewrite technical
+              details</a>.)
               This is not the serious overhead it may seem to be - 
               this re-injection is completely internal to the 
              Apache server (and the same procedure is used by 

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 452129fa5e27ea7ad074a1f9bed302bccffc963d..e0a4e1da66561f19f262b45726f9d8b86569af36 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -611,7 +611,10 @@ Result:
               correct Apache internal processing. Because the
               per-directory rewriting comes late in the
               process, the rewritten request
-              has to be re-injected into the Apache kernel. 
+              has to be re-injected into the Apache kernel, as if it
+              were a new request. (See <a
+              href="../rewrite/rewrite_tech.html">mod_rewrite technical
+              details</a>.)
               This is not the serious overhead it may seem to be - 
               this re-injection is completely internal to the 
              Apache server (and the same procedure is used by