summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRich Bowen <rbowen@apache.org>2011-04-04 14:21:22 +0200
committerRich Bowen <rbowen@apache.org>2011-04-04 14:21:22 +0200
commit2899287748125ed9bdb395af8bbd0ee81dc1cbd9 (patch)
tree926e76673fd0f25a6eaa0946f5a296f4b7259d27 /docs
parentAdds a new section for the [END] flag. This duplicates text from the [L] (diff)
downloadapache2-2899287748125ed9bdb395af8bbd0ee81dc1cbd9.tar.xz
apache2-2899287748125ed9bdb395af8bbd0ee81dc1cbd9.zip
Markup typos. Rebuild HTML.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088588 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/new_features_2_4.html.en6
-rw-r--r--docs/manual/new_features_2_4.html.fr7
-rw-r--r--docs/manual/new_features_2_4.xml2
-rw-r--r--docs/manual/rewrite/flags.html.en10
-rw-r--r--docs/manual/rewrite/flags.xml2
5 files changed, 24 insertions, 3 deletions
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index ed05f193cd..239f5b61b0 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -186,6 +186,12 @@
<dt><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></dt>
<dd><code class="module"><a href="./mod/mod_info.html">mod_info</a></code> can now dump the pre-parsed configuration
to stdout during server startup.</dd>
+
+ <dt><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></dt>
+ <dd><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> adds the <code>[QSD]</code>
+ (Query String Discard) and <code>[END]</code> flags for
+ <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to
+ simplify common rewriting scenarios.</dd>
</dl>
</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/new_features_2_4.html.fr b/docs/manual/new_features_2_4.html.fr
index 75bf9cf53e..d7643050d2 100644
--- a/docs/manual/new_features_2_4.html.fr
+++ b/docs/manual/new_features_2_4.html.fr
@@ -206,11 +206,16 @@ serveur HTTP Apache</h1>
clients anciens qui nécessitent de tels en-têtes (Ceci affecte
tous les modules qui utilisent ces variables d'environnement).</dd>
- <dt>Conteneurs de logique d'autorisation de <code class="module"><a href="./mod/mod_authz_core.html">mod_authz_core</a></code></dt>
+ <dt><code class="module"><a href="./mod/mod_authz_core.html">mod_authz_core</a></code>Conteneurs de logique d'autorisation</dt>
<dd>La directive <code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code> et les directives de
conteneurs associées, comme <code class="directive"><a href="./mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>, permettent de définir une
logique d'autorisation avancée.</dd>
+
+ <dt><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></dt>
+ <dd><code class="module"><a href="./mod/mod_info.html">mod_info</a></code> est maintenant capable d'afficher la
+ configuration préinterprétée sur stdout au cours du démarrage du
+ serveur.</dd>
</dl>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index ae4c466389..95a4f425ab 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -185,7 +185,7 @@
<dd><module>mod_info</module> can now dump the pre-parsed configuration
to stdout during server startup.</dd>
- <dt><module>mod_rewrite</module></td>
+ <dt><module>mod_rewrite</module></dt>
<dd><module>mod_rewrite</module> adds the <code>[QSD]</code>
(Query String Discard) and <code>[END]</code> flags for
<directive module="mod_rewrite">RewriteRule</directive> to
diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 945ce8a6d3..f93dd4a83e 100644
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -32,6 +32,7 @@ providing detailed explanations and examples.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_co">CO|cookie</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_dpi">DPI|discardpathinfo</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_e">E|env</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flag_end">END</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_f">F|forbidden</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_g">G|gone</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_h">H|handler</a></li>
@@ -261,6 +262,15 @@ CustomLog logs/access_log combined env=!image
an example, not as a recommendation.</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_end" id="flag_end">END</a></h2>
+<p>Using the [END] flag terminates not only the current round ot rewrite
+processing (like [L]) but also prevents any subsequent rewrite
+processing from occurring in per-directory (htaccess) context.</p>
+
+<p>This does not apply to new requests resulting from external
+redirects.</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_f" id="flag_f">F|forbidden</a></h2>
<p>Using the [F] flag causes the server to return a 403 Forbidden status
code to the client. While the same behavior can be accomplished using
diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index 14086ab03e..c2d360cbfc 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -258,7 +258,7 @@ an example, not as a recommendation.</p>
<section id="flag_end"><title>END</title>
<p>Using the [END] flag terminates not only the current round ot rewrite
processing (like [L]) but also prevents any subsequent rewrite
-processing from occurring in per-directory (htaccess) context.<p>
+processing from occurring in per-directory (htaccess) context.</p>
<p>This does not apply to new requests resulting from external
redirects.</p>