xml fix

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

diff --git a/docs/manual/rewrite/avoid.xml.de b/docs/manual/rewrite/avoid.xml.de
index efdf041a1dd3bf2436f82b4fffb8888d948e3f55..09a08c29d6ceb642f9d1f1fcdf80fe8d57589415 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.de
+++ b/docs/manual/rewrite/avoid.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/avoid.xml.es b/docs/manual/rewrite/avoid.xml.es
index abc84077b7cac82d2ed278fa78f9ab432a7d2767..5e120ff5cb91203966f81f4ce7305863830c8929 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.es
+++ b/docs/manual/rewrite/avoid.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/avoid.xml.fr b/docs/manual/rewrite/avoid.xml.fr
index ce04504a94aee60381d697baecc272a614f6dfaa..561973a76e95ed6dfec212147ccfb5f2663f45dc 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.fr
+++ b/docs/manual/rewrite/avoid.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/avoid.xml.ja b/docs/manual/rewrite/avoid.xml.ja
index 2ea1af408bcbb93594d9b4bca95ff4fb25b072a6..bcc7171014aaf826170f9f42d5dabe886758f4e6 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.ja
+++ b/docs/manual/rewrite/avoid.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/avoid.xml.ko b/docs/manual/rewrite/avoid.xml.ko
index 9db43e26809f19d3c3a743d892270f067b044c7c..f0124d99775937ba1873f6f343ccb62c171e1b0e 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.ko
+++ b/docs/manual/rewrite/avoid.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/avoid.xml.tr b/docs/manual/rewrite/avoid.xml.tr
index 2b5bf7d0b7d12fa74155a127becd0f8587250d30..7f35ab32e424e88371f14fc1ae7d928e3b22db63 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.tr
+++ b/docs/manual/rewrite/avoid.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/avoid.xml.zh-cn b/docs/manual/rewrite/avoid.xml.zh-cn
index c4350d3b720f509a4e178f722c2e666a858e07aa..7fc3f7f8b9bd6bf2e1aef38355030d555adaa2a7 100644 (file)
--- a/docs/manual/rewrite/avoid.xml.zh-cn
+++ b/docs/manual/rewrite/avoid.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.html.en.utf8 b/docs/manual/rewrite/flags.html.en.utf8
index 7b869df2a5a83a919b29df28ef48649d55776869..a3d43508499abc30e62d410e72ca37910c5b612b 100644 (file)
--- a/docs/manual/rewrite/flags.html.en.utf8
+++ b/docs/manual/rewrite/flags.html.en.utf8
@@ -408,7 +408,7 @@ RewriteRule "^(.*)$" "/index.php" [END]</pre>
 <p>This does not apply to new requests resulting from external
 redirects.</p>
 
-<p>See the <a href="htaccess.html#loops">.htaccess looping</a>
+<p>See the <a href="htaccess.html#loops">Per-directory Rewrites</a>
 discussion for a detailed explanation of why [L] behaves differently
 in per-directory context, and when [END] is the right choice.</p>
 
@@ -487,30 +487,12 @@ further rules will be processed. This corresponds to the
 C. Use this flag to indicate that the current rule should be applied
 immediately without considering further rules.</p>
 
-<p>If you are using <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> in either
-<code>.htaccess</code> files or in
-<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections,
-it is important to have some understanding of how the rules are
-processed.  The simplified form of this is that once the rules have been
-processed, the rewritten request is handed back to the URL parsing
-engine to do what it may with it. It is possible that as the rewritten
-request is handled, the <code>.htaccess</code> file or
-<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> section
-may be encountered again, and thus the ruleset may be run again from the
-start. Most commonly this will happen if one of the rules causes a
-redirect - either internal or external - causing the request process to
-start over.</p>
-
-<p>It is therefore important, if you are using <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives in one of these
-contexts, that you take explicit steps to avoid rules looping, and not
-count solely on the [L] flag to terminate execution of a series of
-rules, as shown below.</p>
-
-<p> An alternative flag, [END], can be used to terminate not only the
-current round of rewrite processing but prevent any subsequent
-rewrite processing from occurring in per-directory (htaccess)
-context. This does not apply to new requests resulting from external
-redirects.</p>
+<p>In <a class="glossarylink" href="../glossary.html#perdirectory" title="see glossary">per-directory</a> context,
+[L] stops the current pass through the ruleset, but the rewritten
+request may be re-processed from the top — which can cause loops.
+Use the <a href="#flag_end">[END]</a> flag to prevent this, or see
+the <a href="htaccess.html#loops">Per-directory Rewrites</a> document
+for a full discussion of the issue and alternative solutions.</p>
 
 <p>The example given here will rewrite any request to
 <code>index.php</code>, giving the original request as a query string

diff --git a/docs/manual/rewrite/flags.xml.de b/docs/manual/rewrite/flags.xml.de
index 59a2cf2334405fabd08cc1a9b6ec8eef97254975..fe8f15e69a27a8a597db7314df970259ec5c6a3d 100644 (file)
--- a/docs/manual/rewrite/flags.xml.de
+++ b/docs/manual/rewrite/flags.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.xml.es b/docs/manual/rewrite/flags.xml.es
index d880934878b5b45d135c5bc0c9dc7683e3172982..d3b7c87e27c8ed14866748933b5d8133a86cff39 100644 (file)
--- a/docs/manual/rewrite/flags.xml.es
+++ b/docs/manual/rewrite/flags.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index 7ec0f1d7f9e3c5ba14f71b56b6cd3ded57e55805..a7f26b29f1715ed951060e9f4abc88a76b0728a5 100644 (file)
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/flags.xml.ja b/docs/manual/rewrite/flags.xml.ja
index 866b45c96ce349dc58686e632d5dffc40339dd89..a09ec42a1a6681d8d2e8754a70a8785dd60ee988 100644 (file)
--- a/docs/manual/rewrite/flags.xml.ja
+++ b/docs/manual/rewrite/flags.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.xml.ko b/docs/manual/rewrite/flags.xml.ko
index bb9c4a6cad7b391444c4969e34f7c6cc7f13adbb..4c356396e1b62957315b24982cbcc606092768a6 100644 (file)
--- a/docs/manual/rewrite/flags.xml.ko
+++ b/docs/manual/rewrite/flags.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.xml.tr b/docs/manual/rewrite/flags.xml.tr
index 5725bd5526b400ca6b11952327351446d59e158b..7efbedf05b1a1c451001d727892648090e939940 100644 (file)
--- a/docs/manual/rewrite/flags.xml.tr
+++ b/docs/manual/rewrite/flags.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/flags.xml.zh-cn b/docs/manual/rewrite/flags.xml.zh-cn
index e8f4228ff805455b63addc4ebd15c7c5bdf3c540..5924d51e67a975f63dc706b60ce5b08f2eddaed4 100644 (file)
--- a/docs/manual/rewrite/flags.xml.zh-cn
+++ b/docs/manual/rewrite/flags.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933062:1933739 (outdated) -->
+<!-- English Revision: 1933062:1934106 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.html.en.utf8 b/docs/manual/rewrite/htaccess.html.en.utf8
index a7ba39a117c19e67e9f61173577eb32e460deeb9..67a4e3b2a7b2e7c4bf33ccad466a59eefaeb05a1 100644 (file)
--- a/docs/manual/rewrite/htaccess.html.en.utf8
+++ b/docs/manual/rewrite/htaccess.html.en.utf8
@@ -130,6 +130,14 @@ where the rule lives:</p>
 in either the pattern or the substitution. This is the single most
 common source of confusion with per-directory rewriting.</p>
 
+<p>When a substitution is made in per-directory context, Apache issues
+a new internal subrequest with the rewritten URL, restarting request
+processing from the top. If the substitution is a relative path,
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code> directive
+determines what URL-path prefix is prepended. This subrequest
+mechanism is also why rules can loop — see
+<a href="#loops">below</a>.</p>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="rewritebase" id="rewritebase">When you need RewriteBase</a> <a title="Permanent link" href="#rewritebase" class="permalink">&para;</a></h2>

diff --git a/docs/manual/rewrite/htaccess.xml.de b/docs/manual/rewrite/htaccess.xml.de
index 98295e1beee3ee87911313a62c6816826a9bedcb..47e4249005b76dbc9f8942583003f99be0e59baa 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.de
+++ b/docs/manual/rewrite/htaccess.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.xml.es b/docs/manual/rewrite/htaccess.xml.es
index 6aabb6d947987edfd32bee18ad3272db732065a4..7fc920257e7dfb83213be0bbbdc94cb56e64539c 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.es
+++ b/docs/manual/rewrite/htaccess.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.xml.fr b/docs/manual/rewrite/htaccess.xml.fr
index 701e2fc67336c0bf7e39d8fe14023b9e58901c9b..2abe790b64654292c1bb397d4a989dcc7b08f5d8 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.fr
+++ b/docs/manual/rewrite/htaccess.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/htaccess.xml.ja b/docs/manual/rewrite/htaccess.xml.ja
index 13f2f6f2718f3b7ddf9e0924303a0f6efcede334..7a32ef5482882b2bd49be16184c781216e80e9f5 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.ja
+++ b/docs/manual/rewrite/htaccess.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.xml.ko b/docs/manual/rewrite/htaccess.xml.ko
index bd71f27a57ebb0df2d5995d9cafa9cf7de840c0b..aa929fd1ee812f796a94caea3c00d029b01fbd56 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.ko
+++ b/docs/manual/rewrite/htaccess.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.xml.tr b/docs/manual/rewrite/htaccess.xml.tr
index 7a5cd06e4b5d85a250f5b08472257c1d36d1f76d..434cc23e000d231d7e4b01d027de5061906dab4f 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.tr
+++ b/docs/manual/rewrite/htaccess.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/htaccess.xml.zh-cn b/docs/manual/rewrite/htaccess.xml.zh-cn
index 8766545b4740b07df9bc601ed43fd4dc2872c481..4352683bb654064e183d851978b503d527fb2327 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml.zh-cn
+++ b/docs/manual/rewrite/htaccess.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933067:1934084 (outdated) -->
+<!-- English Revision: 1933067:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.html.en.utf8 b/docs/manual/rewrite/index.html.en.utf8
index 82831688adaac095271299bebcc08cdb1d09370f..7f9e557e257795cc721c1afe4498c6822e7920d9 100644 (file)
--- a/docs/manual/rewrite/index.html.en.utf8
+++ b/docs/manual/rewrite/index.html.en.utf8
@@ -34,6 +34,16 @@
 </div>
 
 
+<p><em>The great thing about mod_rewrite is it gives you all the
+configurability and flexibility of Sendmail. The downside to
+mod_rewrite is that it gives you all the configurability and
+flexibility of Sendmail.</em>
+-- Brian Behlendorf</p>
+
+<p><em>Despite the tons of examples and docs, mod_rewrite is voodoo.
+Damned cool voodoo, but still voodoo.</em>
+-- Brian Moore</p>
+
     <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> provides a way to modify incoming
     URL requests, dynamically, based on <a href="intro.html#regex">regular
     expression</a> rules. This allows you to map arbitrary URLs onto

diff --git a/docs/manual/rewrite/index.xml b/docs/manual/rewrite/index.xml
index 5134ac219f5dfd63fabf264a4f0746ad45c2fa1a..c5c8fee244daf1c31954f9742ce7a7a294e33ba1 100644 (file)
--- a/docs/manual/rewrite/index.xml
+++ b/docs/manual/rewrite/index.xml
@@ -25,17 +25,17 @@
 
   <title>Guide to Apache mod_rewrite</title>
 
-<p>The great thing about mod_rewrite is it gives you all the
+<summary>
+
+<p><em>The great thing about mod_rewrite is it gives you all the
 configurability and flexibility of Sendmail. The downside to
 mod_rewrite is that it gives you all the configurability and
-flexibility of Sendmail.</p>
-<p><em>-- Brian Behlendorf</em></p>
+flexibility of Sendmail.</em>
+-- Brian Behlendorf</p>
 
-<p>Despite the tons of examples and docs, mod_rewrite is voodoo.
-Damned cool voodoo, but still voodoo.</p>
-<p><em>-- Brian Moore</em></p>
-
-<summary>
+<p><em>Despite the tons of examples and docs, mod_rewrite is voodoo.
+Damned cool voodoo, but still voodoo.</em>
+-- Brian Moore</p>
 
     <p><module>mod_rewrite</module> provides a way to modify incoming
     URL requests, dynamically, based on <a href="intro.html#regex">regular

diff --git a/docs/manual/rewrite/index.xml.de b/docs/manual/rewrite/index.xml.de
index 5c57310e40b4527bba856580f2a5908200c21c33..108ea9fe9db76e6e23650130a1686f9d8cc6568f 100644 (file)
--- a/docs/manual/rewrite/index.xml.de
+++ b/docs/manual/rewrite/index.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.xml.es b/docs/manual/rewrite/index.xml.es
index 350d5da0f1493f0505a8b72efeb3403b669fbe41..d4efd7dda9e18bd07a848cf592af801e7ab9c2c4 100644 (file)
--- a/docs/manual/rewrite/index.xml.es
+++ b/docs/manual/rewrite/index.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.xml.fr b/docs/manual/rewrite/index.xml.fr
index 083f616c249200fcdb21e5a3bc088d53f2ba7fb9..621bcee9d1c91a2b7ed6654cf058e3773cb63711 100644 (file)
--- a/docs/manual/rewrite/index.xml.fr
+++ b/docs/manual/rewrite/index.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/index.xml.ja b/docs/manual/rewrite/index.xml.ja
index 731e06018975f169fb52f69955a8d0ce539904ec..3e9bbbe042494202856906875d931b6163284752 100644 (file)
--- a/docs/manual/rewrite/index.xml.ja
+++ b/docs/manual/rewrite/index.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.xml.ko b/docs/manual/rewrite/index.xml.ko
index 2f8c72ad1d9cba3af12d87a77487f8aa8b22164b..67b1fbd335942e571c70ccddbf2ca94594965957 100644 (file)
--- a/docs/manual/rewrite/index.xml.ko
+++ b/docs/manual/rewrite/index.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.xml.tr b/docs/manual/rewrite/index.xml.tr
index 703982bebf976d924a3da717ca87acb3a929f8b4..b3cc7bfa33aa994511f3b6a5f4fa8e4c04b880c5 100644 (file)
--- a/docs/manual/rewrite/index.xml.tr
+++ b/docs/manual/rewrite/index.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/index.xml.zh-cn b/docs/manual/rewrite/index.xml.zh-cn
index be36f587f1a11a8729d25ee146bdf605cbb21130..82da39fe76b0e9796e5e4f0ecf484adacc3029ee 100644 (file)
--- a/docs/manual/rewrite/index.xml.zh-cn
+++ b/docs/manual/rewrite/index.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933438:1934083 (outdated) -->
+<!-- English Revision: 1933438:1934090 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.html.en.utf8 b/docs/manual/rewrite/intro.html.en.utf8
index feb12a427ab166da77d2a0ca25ab1e7fa0d9ce99..126f14c290d814e1dc4adf3382198ea1092d4b06 100644 (file)
--- a/docs/manual/rewrite/intro.html.en.utf8
+++ b/docs/manual/rewrite/intro.html.en.utf8
@@ -363,20 +363,14 @@ rewriting for you. This is discussed in greater detail in the <a href="rewritema
 <div class="section">
 <h2><a name="htaccess" id="htaccess">.htaccess files</a> <a title="Permanent link" href="#htaccess" class="permalink">&para;</a></h2>
 
-<p>Rewriting is typically configured in the main server configuration
-setting (outside any <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> section) or
-inside <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-containers. This is the easiest way to do rewriting and is
-recommended. It is possible, however, to do rewriting
-inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-sections or <a href="../howto/htaccess.html"><code>.htaccess</code>
-files</a> at the expense of some additional complexity. This technique
-is called <a class="glossarylink" href="../glossary.html#perdirectory" title="see glossary">per-directory</a> rewrites.</p>
-
-<p>The main difference from per-server rewrites is that the path
-prefix of the directory containing the <code>.htaccess</code> file is
-stripped before matching in
-the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>. In addition, the <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code> should be used to assure the request is properly mapped.</p>
+<p>It is possible to use rewrite rules in
+<a class="glossarylink" href="../glossary.html#perdirectory" title="see glossary">per-directory</a> context
+(<a href="../howto/htaccess.html"><code>.htaccess</code> files</a> and
+<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> blocks),
+but the rules behave differently there — in particular, the directory
+prefix is stripped from the URL before matching. See the
+<a href="htaccess.html#path-stripping">Per-directory Rewrites</a>
+document for full details.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/rewrite/intro.xml.de b/docs/manual/rewrite/intro.xml.de
index 7d3ae9735e8756853a1ee8ec37ed64112d4c236a..d97b7b55ee82cd1ee934aa68a457d7666c954ce7 100644 (file)
--- a/docs/manual/rewrite/intro.xml.de
+++ b/docs/manual/rewrite/intro.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.xml.es b/docs/manual/rewrite/intro.xml.es
index 48db5845f2b83d81ab717a7f25f799b65fc43c5c..7314b0dca4f63879c282e15aa920d4d87ad3a1e0 100644 (file)
--- a/docs/manual/rewrite/intro.xml.es
+++ b/docs/manual/rewrite/intro.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.xml.fr b/docs/manual/rewrite/intro.xml.fr
index 5006ab8ff7b07faf9c1537c07efabbfdf18ce7bf..703092850c92204ebee30cf988ebf8d956b7bf2a 100644 (file)
--- a/docs/manual/rewrite/intro.xml.fr
+++ b/docs/manual/rewrite/intro.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/intro.xml.ja b/docs/manual/rewrite/intro.xml.ja
index 720148a08313694ac5eab7ff63e0f13c85eb1d03..06a7bc8b522d56a08777268f5317a130b3c2e23c 100644 (file)
--- a/docs/manual/rewrite/intro.xml.ja
+++ b/docs/manual/rewrite/intro.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.xml.ko b/docs/manual/rewrite/intro.xml.ko
index 6fb072078af8e892402f12cd90551fbcc182edfb..74114f178637c5ce143dbe8cd74d6c4fb7e4bedc 100644 (file)
--- a/docs/manual/rewrite/intro.xml.ko
+++ b/docs/manual/rewrite/intro.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.xml.tr b/docs/manual/rewrite/intro.xml.tr
index 9d2e7b110767d376f8b9e9351ee91651aebd1803..cef5ef751b7bc5cb3e2eb8aa49f96e67e3037aeb 100644 (file)
--- a/docs/manual/rewrite/intro.xml.tr
+++ b/docs/manual/rewrite/intro.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/intro.xml.zh-cn b/docs/manual/rewrite/intro.xml.zh-cn
index 1ea893534fd4a261f68b008b176a49d806d8a17f..f661690544b21e20a2eae2d5f90fdc379b8379fe 100644 (file)
--- a/docs/manual/rewrite/intro.xml.zh-cn
+++ b/docs/manual/rewrite/intro.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933423:1933724 (outdated) -->
+<!-- English Revision: 1933423:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/rewritemap.html.en.utf8 b/docs/manual/rewrite/rewritemap.html.en.utf8
index 31f13a9109d5cca835c93662d5ecc6192584cdb2..f064759ddf430c4e475ce0616f38f4424ff20408 100644 (file)
--- a/docs/manual/rewrite/rewritemap.html.en.utf8
+++ b/docs/manual/rewrite/rewritemap.html.en.utf8
@@ -49,7 +49,7 @@ and provides examples of each of the various <code class="directive"><a href="..
 <li><img alt="" src="../images/down.gif" /> <a href="#dbd">dbd or fastdbd: SQL Query</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sharding">URL-based sharding across multiple backends</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#summary">Summary</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="vhosts.html">Virtual hosts</a></li><li><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="vhosts.html">Virtual hosts</a></li><li><a href="htaccess.html">Per-directory Rewrites</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="introduction" id="introduction">Introduction</a> <a title="Permanent link" href="#introduction" class="permalink">&para;</a></h2>

diff --git a/docs/manual/rewrite/rewritemap.xml.de b/docs/manual/rewrite/rewritemap.xml.de
index 218d813a6d344df87c1254ca5900a29de3b0e2d8..4300c933699319a0e90235cdf4ba3998e467e5ed 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.de
+++ b/docs/manual/rewrite/rewritemap.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

diff --git a/docs/manual/rewrite/rewritemap.xml.es b/docs/manual/rewrite/rewritemap.xml.es
index 11bde3ae528d0f509dda5b0fbbb2754b1d3af8d1..292e262683296dd1da721c2919292b480fceb5c2 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.es
+++ b/docs/manual/rewrite/rewritemap.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

diff --git a/docs/manual/rewrite/rewritemap.xml.fr b/docs/manual/rewrite/rewritemap.xml.fr
index 172b0491918ecf5c346956174e4e488097ea8427..286cb66b16de8baa17c006149bdd1151e40105d9 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.fr
+++ b/docs/manual/rewrite/rewritemap.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/rewritemap.xml.ja b/docs/manual/rewrite/rewritemap.xml.ja
index 49e98547121ee49b2c2e8711eae1488e36a85da4..a4656191a51b700ca3c9729a7edac32c4621bbc3 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.ja
+++ b/docs/manual/rewrite/rewritemap.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/rewritemap.xml.ko b/docs/manual/rewrite/rewritemap.xml.ko
index ad413ce9ebd971ed7c1fdd6abfcfecc7c88af624..a40f744c840df60c9d1c93146997414f07cd3b56 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.ko
+++ b/docs/manual/rewrite/rewritemap.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/rewritemap.xml.tr b/docs/manual/rewrite/rewritemap.xml.tr
index d3aa39ee6f8e4b4a39ff699c222a7727eca8aea9..2d0b4918073fdbec460aa75da88fe162734a0401 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.tr
+++ b/docs/manual/rewrite/rewritemap.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

diff --git a/docs/manual/rewrite/rewritemap.xml.zh-cn b/docs/manual/rewrite/rewritemap.xml.zh-cn
index d5f1ac4d36c40e6f7a4d7d8f2415ff829c161e99..00aca550f4124dbebf72144c157e9e6e7a7de753 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.zh-cn
+++ b/docs/manual/rewrite/rewritemap.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1932819:1933728 (outdated) -->
+<!-- English Revision: 1932819:1934098 (outdated) -->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

diff --git a/docs/manual/rewrite/tech.html.en.utf8 b/docs/manual/rewrite/tech.html.en.utf8
index 16a759db12cf8be02d6cacb4dac42ec6bcccd208..8ae319b91a7c3e156bb42360dcdf97ea9503674d 100644 (file)
--- a/docs/manual/rewrite/tech.html.en.utf8
+++ b/docs/manual/rewrite/tech.html.en.utf8
@@ -38,7 +38,7 @@ and URL matching.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#InternalAPI">API Phases</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#InternalRuleset">Ruleset Processing</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="vhosts.html">Virtual hosts</a></li><li><a href="rewritemap.html">Using RewriteMap</a></li><li><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="vhosts.html">Virtual hosts</a></li><li><a href="rewritemap.html">Using RewriteMap</a></li><li><a href="htaccess.html">Per-directory Rewrites</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="InternalAPI" id="InternalAPI">API Phases</a> <a title="Permanent link" href="#InternalAPI" class="permalink">&para;</a></h2>
@@ -74,61 +74,13 @@ and URL matching.</p>
     <p>In each of these cases, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> rewrites the
     <code>REQUEST_URI</code> either to a new URL, or to a filename.</p>
 
-    <p>In <a class="glossarylink" href="../glossary.html#perdirectory" title="see glossary">per-directory context</a> (i.e., within <code>.htaccess</code> files
-    and <code>Directory</code> blocks), these rules are being applied
-    after a URL has already been translated to a filename. Because of
-    this, the URL-path that <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> initially compares <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives against
-    is the full filesystem path to the translated filename with the current
-    directories path (including a trailing slash) removed from the front.</p>
-
-    <p> To illustrate: If rules are in /var/www/foo/.htaccess and a request
-    for /foo/bar/baz is being processed, an expression like ^bar/baz$ would
-    match.</p>
-
-    <p> If a substitution is made in per-directory context, a new internal
-    subrequest is issued with the new URL, which restarts processing of the
-    request phases. If the substitution is a relative path, the <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code> directive
-    determines the URL-path prefix prepended to the substitution.
-    In per-directory context, care must be taken to
-    create rules which will eventually (in some future "round" of per-directory
-    rewrite processing) not perform a substitution to avoid looping.
-    (See <a href="https://cwiki.apache.org/confluence/display/httpd/RewriteLooping">RewriteLooping</a>
-    for further discussion of this problem.)</p>
-
-    <p>Because of this further manipulation of the URL in per-directory
-    context, you'll need to take care to craft your rewrite rules
-    differently in that context. In particular, remember that the
-    leading directory path will be stripped off of the URL that your
-    rewrite rules will see. Consider the examples below for further
-    clarification.</p>
-
-    <table class="bordered">
-
-        <tr>
-            <th>Location of rule</th>
-            <th>Rule</th>
-        </tr>
-
-        <tr>
-            <td>VirtualHost section</td>
-            <td>RewriteRule "^/images/(.+)\.jpg" "/images/$1.gif"</td>
-        </tr>
-
-        <tr>
-            <td>.htaccess file in document root</td>
-            <td>RewriteRule "^images/(.+)\.jpg" "images/$1.gif"</td>
-        </tr>
-
-        <tr>
-            <td>.htaccess file in images directory</td>
-            <td>RewriteRule "^(.+)\.jpg" "$1.gif"</td>
-        </tr>
-
-    </table>
-
-    <p>For even more insight into how <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> manipulates URLs in
-    different contexts, you should consult the <a href="../mod/mod_rewrite.html#logging">log entries</a> made during
-    rewriting.</p>
+    <p>In <a class="glossarylink" href="../glossary.html#perdirectory" title="see glossary">per-directory context</a>,
+    rules are applied during the Fixup phase after the URL has already
+    been translated to a filename. This changes what the pattern matches
+    against and how substitutions are handled. See the
+    <a href="htaccess.html#path-stripping">Per-directory Rewrites</a>
+    document for practical details on path stripping, RewriteBase, and
+    how to avoid looping.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/rewrite/tech.xml.de b/docs/manual/rewrite/tech.xml.de
index 31fe73fac5108d4666c64a74af063bcef88efb6c..afc812904aa727660207b3956b7ee277f7f81b94 100644 (file)
--- a/docs/manual/rewrite/tech.xml.de
+++ b/docs/manual/rewrite/tech.xml.de
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/tech.xml.es b/docs/manual/rewrite/tech.xml.es
index 8c7936c2827023e74f3ebb92d2313031359d6d6e..b9d0bcdf04fd83c6c1ec50805a74f66b75fa7e06 100644 (file)
--- a/docs/manual/rewrite/tech.xml.es
+++ b/docs/manual/rewrite/tech.xml.es
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/tech.xml.fr b/docs/manual/rewrite/tech.xml.fr
index dd0d4e4b990296adef8168cf4420389418bf6bea..a5dd91a27092d3120079e72347f0d64211efddfe 100644 (file)
--- a/docs/manual/rewrite/tech.xml.fr
+++ b/docs/manual/rewrite/tech.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/tech.xml.ja b/docs/manual/rewrite/tech.xml.ja
index 730fdc21450d4b5bb16d4c90a243a38b2ba0f8bb..b00ee4da247f4a430b6138aec38e4e1780546d2c 100644 (file)
--- a/docs/manual/rewrite/tech.xml.ja
+++ b/docs/manual/rewrite/tech.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/tech.xml.ko b/docs/manual/rewrite/tech.xml.ko
index dc1749776b9600704394727ff1a1677c6207d306..e65084d939e0d202b6a961682df0ac575f5a5ad4 100644 (file)
--- a/docs/manual/rewrite/tech.xml.ko
+++ b/docs/manual/rewrite/tech.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/tech.xml.tr b/docs/manual/rewrite/tech.xml.tr
index de670b4aa2c6ec34dc8c50e130a490292e2b32d1..3ec29423c908bc3d0e21a1c131642571660cd796 100644 (file)
--- a/docs/manual/rewrite/tech.xml.tr
+++ b/docs/manual/rewrite/tech.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/tech.xml.zh-cn b/docs/manual/rewrite/tech.xml.zh-cn
index 4ae64b93cf2357436b888e8c74c1f037afe5e354..68d5ec00a50e6b2b6a717bf3cf275ffc5685b478 100644 (file)
--- a/docs/manual/rewrite/tech.xml.zh-cn
+++ b/docs/manual/rewrite/tech.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933438:1933718 (outdated) -->
+<!-- English Revision: 1933438:1934108 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.html.en.utf8 b/docs/manual/rewrite/vhosts.html.en.utf8
index b9198f10ba514842a553fc7cab5d8f5a1f8b29d6..e7d43db60c0a069def51639728dfdcd4716efd60 100644 (file)
--- a/docs/manual/rewrite/vhosts.html.en.utf8
+++ b/docs/manual/rewrite/vhosts.html.en.utf8
@@ -49,7 +49,7 @@ mod_rewrite</a> document.</div>
 <li><img alt="" src="../images/down.gif" /> <a href="#simple.rewrite">Dynamic
     Virtual Hosts Using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#xtra-conf">Using a Separate Virtual Host Configuration File</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="rewritemap.html">RewriteMap</a></li><li><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection and remapping</a></li><li><a href="rewritemap.html">RewriteMap</a></li><li><a href="htaccess.html">Per-directory Rewrites</a></li><li><a href="avoid.html">When not to use mod_rewrite</a></li><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="per-hostname" id="per-hostname">Virtual Hosts For Arbitrary Hostnames</a> <a title="Permanent link" href="#per-hostname" class="permalink">&para;</a></h2>

diff --git a/docs/manual/rewrite/vhosts.xml.de b/docs/manual/rewrite/vhosts.xml.de
index 338818823940c618f5fc22634445bca2bf2034d9..c331ca1ebe98b909f963ab153c819d288f07fdb8 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.de
+++ b/docs/manual/rewrite/vhosts.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.xml.es b/docs/manual/rewrite/vhosts.xml.es
index bda42335bfbc4ac09089583e6dc2dd33c6c55466..6761ce30c8cc934a2ca2c24c752a13a7fef6a845 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.es
+++ b/docs/manual/rewrite/vhosts.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.xml.fr b/docs/manual/rewrite/vhosts.xml.fr
index 46c26805a3a12bc6d28f0c6b5f92dc7a3eb848eb..241bd1792cdfe6704e8507588dd1548d941debd7 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.fr
+++ b/docs/manual/rewrite/vhosts.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/rewrite/vhosts.xml.ja b/docs/manual/rewrite/vhosts.xml.ja
index 90d71c2a71e15cdc6663d548757805edc0de7fae..9de2e1e444c2e3845ba3eadcdfce240459ece2c9 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.ja
+++ b/docs/manual/rewrite/vhosts.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.xml.ko b/docs/manual/rewrite/vhosts.xml.ko
index 139e4f24f9d4fd9f7e8e616db91825e74328ce1a..2248bed15adbaae42ebfd5b5c03b38dd8b409891 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.ko
+++ b/docs/manual/rewrite/vhosts.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.xml.tr b/docs/manual/rewrite/vhosts.xml.tr
index 1ae8979f3b6ab29cd79a7537da6ac15cb7530d21..4109a56f7051d6b7351e3f1e20dec3c7a733003f 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.tr
+++ b/docs/manual/rewrite/vhosts.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/rewrite/vhosts.xml.zh-cn b/docs/manual/rewrite/vhosts.xml.zh-cn
index f5aade76f5d0b3ae7b6538fe022a83be1ab529c4..dba1d15d7dd88a0fb984bd70e48b320a5adc80ca 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml.zh-cn
+++ b/docs/manual/rewrite/vhosts.xml.zh-cn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1933071:1933718 (outdated) -->
+<!-- English Revision: 1933071:1934098 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more