Fix links to rewrite stuff.

Remove 2.4-specific flag.

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

diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 33248f0242fa675c065a77bc6255a68bcdf4acf3..8b43e810872d7cd765db2166635a5b09b117519f 100644 (file)
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -43,7 +43,6 @@ providing detailed explanations and examples.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_p">P|proxy</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_pt">PT|passthrough</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_qsa">QSA|qsappend</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#flag_qsd">QSD|qsdiscard</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_r">R|redirect</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_s">S|skip</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#flag_t">T|type</a></li>
@@ -545,29 +544,6 @@ flag, that same request will be mapped to
 <code>/page.php?page=123</code> - that is, the existing query string
 will be discarded.
 </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="flag_qsd" id="flag_qsd">QSD|qsdiscard</a></h2>
-<p>
-When the requested URI contains a query string, and the target URI does
-not, the default behavior of <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> is to copy that query
-string to the target URI. Using the [QSD] flag causes the query string
-to be discarded.
-</p>
-
-<p>This flag is available in version 2.4.0 and later.</p>
-
-<p>
-Using [QSD] and [QSA] together will result in [QSD] taking precedence.
-</p>
-
-<p>
-If the target URI has a query string, the default behavior will be
-observed - that is, the original query string will be discarded and
-replaced with the query string in the <code>RewriteRule</code> target
-URI.
-</p>
-
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="flag_r" id="flag_r">R|redirect</a></h2>

diff --git a/docs/manual/rewrite/index.xml.tr b/docs/manual/rewrite/index.xml.tr
index e529564ea682ef7d898675a06806d912c3ae3f84..6841133751021b301ea32cfaf70478d14c24d10c 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: 636374:1028730 (outdated) -->
+<!-- English Revision: 636374:1082915 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 39ff2f94a62cf276bc4e5a2c45cd766084886cda..adfd1c8fbb56739e572c3a2fa16fb76d2ad04355 100644 (file)
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -95,12 +95,16 @@ Documentation</a>.</p>
 <ul><li class="separate"><a href="rewrite/">Overview</a></li>
 <li><a href="mod/mod_rewrite.html">mod_rewrite reference
 documentation</a></li>
-<li><a href="rewrite/rewrite_intro.html">Introduction</a></li>
-<li><a href="rewrite/rewrite_flags.html">Flags</a></li>
-<li><a href="rewrite/rewrite_tech.html">Technical details</a></li>
-<li><a href="rewrite/rewrite_guide.html">Rewrite Guide - useful examples</a></li>
-<li><a href="rewrite/rewrite_guide_advanced.html">Advanced Rewrite Guide - more
-useful examples</a></li>
+<li><a href="rewrite/intro.html">Introduction</a></li>
+<li><a href="rewrite/flags.html">Flags</a></li>
+<li><a href="rewrite/tech.html">Technical details</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="rewritemap.html">Using RewriteMap</a></li>
+<li><a href="advanced.html">Advanced techniques and tricks</a></li>
+<li><a href="avoid.html">When NOT to use mod_rewrite</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="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index c50c0ed5d7d6860d28f30a5e600308c854137fe4..c238252873cc843d65b823e1106e2b0973173baf 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -80,12 +80,16 @@ Documentation</a>.</p>
 <page separate="yes" href="rewrite/">Overview</page>
 <page href="mod/mod_rewrite.html">mod_rewrite reference
 documentation</page>
-<page href="rewrite/rewrite_intro.html">Introduction</page>
-<page href="rewrite/rewrite_flags.html">Flags</page>
-<page href="rewrite/rewrite_tech.html">Technical details</page>
-<page href="rewrite/rewrite_guide.html">Rewrite Guide - useful examples</page>
-<page href="rewrite/rewrite_guide_advanced.html">Advanced Rewrite Guide - more
-useful examples</page>
+<page href="rewrite/intro.html">Introduction</page>
+<page href="rewrite/flags.html">Flags</page>
+<page href="rewrite/tech.html">Technical details</page>
+<page href="remapping.html">Using mod_rewrite for redirection and remapping of URLs</page>
+<page href="access.html">Using mod_rewrite to control access</page>
+<page href="vhosts.html">Dynamic virtual hosts with mod_rewrite</page>
+<page href="proxy.html">Dynamic proxying with mod_rewrite</page>
+<page href="rewritemap.html">Using RewriteMap</page>
+<page href="advanced.html">Advanced techniques and tricks</page>
+<page href="avoid.html">When <strong>NOT</strong> to use mod_rewrite</page>
 </category>
 
 <category id="ssl">