rewrite guide: update nav, clean See Also blocks, remove boilerplate duplication...

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

diff --git a/docs/manual/rewrite/avoid.xml b/docs/manual/rewrite/avoid.xml
index 230f143d89ca00326e411051be126a292c84b703..5975f41ee7e5ca958c9713542628ec4d804f6ff6 100644 (file)
--- a/docs/manual/rewrite/avoid.xml
+++ b/docs/manual/rewrite/avoid.xml
@@ -55,12 +55,10 @@ files to work with, you may need to resort to
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
 <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-<seealso><a href="access.html">Controlling access</a></seealso>
 <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">Using RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
-<!--<seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>-->
+<!--<seealso><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></seealso>
+<seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>-->
 
 <section id="redirect">
 <title>Simple Redirection</title>

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index 4cf15a9f19253e23fe9f0aeda58aaed2c0241e4b..7427c89ba9389d512f3fada130bc3f50251248f2 100644 (file)
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -34,11 +34,8 @@ providing detailed explanations and examples.</p>
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
 <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-<seealso><a href="access.html">Controlling access</a></seealso>
 <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">Using RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
 <section id="introduction"><title>Introduction</title>

diff --git a/docs/manual/rewrite/htaccess.xml b/docs/manual/rewrite/htaccess.xml
index 934fe5136e63cace8b1306cb86d2718bf60e65a8..6d5d0b61c2f66d397b1dfe8258eb2a397328c4ff 100644 (file)
--- a/docs/manual/rewrite/htaccess.xml
+++ b/docs/manual/rewrite/htaccess.xml
@@ -47,7 +47,7 @@ processes rules in per-directory context, see the
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 <seealso><a href="flags.html">RewriteRule Flags</a></seealso>
 <seealso><a href="tech.html">Technical details</a></seealso>
-<seealso><a href="../mod/mod_rewrite.html#what_is_matched">Substitution string combinations</a></seealso>
+<seealso><a href="../mod/mod_rewrite.html#what_is_matched">What is matched?</a></seealso>
 
 <section id="prerequisites"><title>Prerequisites: AllowOverride</title>
 

diff --git a/docs/manual/rewrite/index.xml b/docs/manual/rewrite/index.xml
index b0c40b3ed06b8ef4657163be181de3383e364ce4..725574eb83420cc0ec0926e76d06f26027331bb4 100644 (file)
--- a/docs/manual/rewrite/index.xml
+++ b/docs/manual/rewrite/index.xml
@@ -67,14 +67,12 @@
 <li><a href="../mod/mod_rewrite.html">mod_rewrite reference
 documentation</a></li>
 <li><a href="intro.html">Introduction to regular expressions and mod_rewrite</a></li>
+<li><a href="htaccess.html">mod_rewrite in .htaccess files</a></li>
 <li><a href="flags.html">RewriteRule Flags</a></li>
 <li><a href="rewritemap.html">Using RewriteMap</a></li>
 <li><a href="avoid.html">When <strong>NOT</strong> to use mod_rewrite</a></li>
 <li><a href="remapping.html">Using mod_rewrite for redirection and remapping of URLs</a></li>
-<li><a href="access.html">Using mod_rewrite to control access</a></li>
 <li><a href="vhosts.html">Dynamic virtual hosts with mod_rewrite</a></li>
-<li><a href="proxy.html">Dynamic proxying with mod_rewrite</a></li>
-<li><a href="advanced.html">Advanced techniques</a></li>
 <li><a href="tech.html">Technical details</a></li>
 </ul>
 </summary>

diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index f1dd0643bcef9e578889a7c8c34aac3c654f097d..5e1b388aec4fb75a4c34b53bd256ebada68571b2 100644 (file)
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -37,11 +37,8 @@ but this doc should help the beginner get their feet wet.
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <!-- <seealso><a href="intro.html">mod_rewrite introduction</a></seealso> -->
 <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-<seealso><a href="access.html">Controlling access</a></seealso>
 <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">Using RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
 <section id="introduction"><title>Introduction</title>
@@ -73,11 +70,11 @@ it will tell you exactly how each rule is processed.</p>
 
 <section id="regex"><title>Regular Expressions</title>
 
-<p><module>mod_rewrite</module> uses the <a href="http://pcre.org/">Perl Compatible
+<p><module>mod_rewrite</module> uses the <a href="https://www.pcre.org/">Perl Compatible
 Regular Expression</a> vocabulary. In this document, we do not attempt
 to provide a detailed reference to regular expressions. For that, we
-recommend the <a href="http://pcre.org/pcre.txt">PCRE man pages</a>, the
-<a href="http://perldoc.perl.org/perlre.html">Perl regular
+recommend the <a href="https://www.pcre.org/pcre.txt">PCRE man pages</a>, the
+<a href="https://perldoc.perl.org/perlre">Perl regular
 expression man page</a>, and <a
 href="https://www.oreilly.com/library/view/mastering-regular-expressions/0596528124/">Mastering
 Regular Expressions, by Jeffrey Friedl</a> (the third edition is from

diff --git a/docs/manual/rewrite/remapping.xml b/docs/manual/rewrite/remapping.xml
index 200d0737fe46535c434545045143baf2c4097865..3322033d4128aeab6e0a4067af51d89331b053a4 100644 (file)
--- a/docs/manual/rewrite/remapping.xml
+++ b/docs/manual/rewrite/remapping.xml
@@ -33,20 +33,12 @@ how you can use <module>mod_rewrite</module> to redirect and remap
 request. This includes many examples of common uses of <module>mod_rewrite</module>,
 including detailed descriptions of how each works.</p>
 
-<note type="warning">Note that many of these examples won't work unchanged in your
-particular server configuration, so it's important that you understand
-them, rather than merely cutting and pasting the examples into your
-configuration.</note>
-
 </summary>
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
 <!--<seealso><a href="remapping.html">Redirection and remapping</a></seealso>-->
-<seealso><a href="access.html">Controlling access</a></seealso>
 <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">Using RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
 <section id="old-to-new">

diff --git a/docs/manual/rewrite/rewritemap.xml b/docs/manual/rewrite/rewritemap.xml
index 81b7c6f80878cfed5cd21db6120adcf6dfb1be92..0f2221cb3cf8c2df724c8081fb0a57dd4f6535d7 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml
+++ b/docs/manual/rewrite/rewritemap.xml
@@ -29,20 +29,13 @@ the use of the <directive module="mod_rewrite">RewriteMap</directive> directive,
 and provides examples of each of the various <directive module="mod_rewrite"
 >RewriteMap</directive> types.</p>
 
-    <note type="warning">Note that many of these examples won't work unchanged in your
-particular server configuration, so it's important that you understand
-them, rather than merely cutting and pasting the examples into your
-configuration.</note>
-
-  </summary>
+      </summary>
   <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
   <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
   <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-  <seealso><a href="access.html">Controlling access</a></seealso>
-  <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-  <seealso><a href="proxy.html">Proxying</a></seealso>
-  <seealso><a href="advanced.html">Advanced techniques</a></seealso>
-  <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
+    <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
+      <seealso><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></seealso>
+<seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
   <section id="introduction">
     <title>Introduction</title>

diff --git a/docs/manual/rewrite/tech.xml b/docs/manual/rewrite/tech.xml
index 28d0024d452a9ebc916d7483d42c5dda4506e65f..10cd6465b0c30f43719ebf2fb627038085ef7df3 100644 (file)
--- a/docs/manual/rewrite/tech.xml
+++ b/docs/manual/rewrite/tech.xml
@@ -32,11 +32,9 @@ and URL matching.</p>
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
 <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-<seealso><a href="access.html">Controlling access</a></seealso>
 <seealso><a href="vhosts.html">Virtual hosts</a></seealso>
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">Using RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
+<seealso><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></seealso>
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
 <section id="InternalAPI"><title>API Phases</title>

diff --git a/docs/manual/rewrite/vhosts.xml b/docs/manual/rewrite/vhosts.xml
index 3c7d4a36fa2a4625cc74806c47946ba4fb6a9ca4..8a9b677b726c83e16b596556f6758663605fd557 100644 (file)
--- a/docs/manual/rewrite/vhosts.xml
+++ b/docs/manual/rewrite/vhosts.xml
@@ -42,11 +42,9 @@ mod_rewrite</a> document.</note>
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="intro.html">mod_rewrite introduction</a></seealso>
 <seealso><a href="remapping.html">Redirection and remapping</a></seealso>
-<seealso><a href="access.html">Controlling access</a></seealso>
 <!--<seealso><a href="vhosts.html">Virtual hosts</a></seealso>-->
-<seealso><a href="proxy.html">Proxying</a></seealso>
 <seealso><a href="rewritemap.html">RewriteMap</a></seealso>
-<seealso><a href="advanced.html">Advanced techniques</a></seealso>
+<seealso><a href="htaccess.html">Per-directory rewrites (.htaccess)</a></seealso>
 <seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
 
 <section id="per-hostname">