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.0.x@721622 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 03925f173acadf9fb7cb897060bfdd01582f8173..7f19a2528d1b341d8762c068a6761db3715f4a90 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -292,7 +292,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 e9e7c895e6ec0359d14a3d7384e93c18fd3bdef8..0e5013098108646951ef6e8141a958f3eea55ead 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -729,7 +729,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