From: Rich Bowen
Date: Mon, 4 Apr 2011 12:21:22 +0000 (+0000)
Subject: Markup typos. Rebuild HTML.
X-Git-Tag: 2.3.12~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2899287748125ed9bdb395af8bbd0ee81dc1cbd9;p=thirdparty%2Fapache%2Fhttpd.git
Markup typos. Rebuild HTML.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1088588 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index ed05f193cd8..239f5b61b08 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -186,6 +186,12 @@
mod_info
mod_info
can now dump the pre-parsed configuration
to stdout during server startup.
+
+ mod_rewrite
+ mod_rewrite
adds the [QSD]
+ (Query String Discard) and [END]
flags for
+ RewriteRule
to
+ simplify common rewriting scenarios.
diff --git a/docs/manual/new_features_2_4.html.fr b/docs/manual/new_features_2_4.html.fr
index 75bf9cf53e8..d7643050d2c 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
clients anciens qui nécessitent de tels en-têtes (Ceci affecte
tous les modules qui utilisent ces variables d'environnement).
-
Conteneurs de logique d'autorisation de mod_authz_core
+
mod_authz_core
Conteneurs de logique d'autorisation
La directive Require
et les directives de
conteneurs associées, comme <RequireAll>
, permettent de définir une
logique d'autorisation avancée.
+
+
mod_info
+
mod_info
est maintenant capable d'afficher la
+ configuration préinterprétée sur stdout au cours du démarrage du
+ serveur.
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index ae4c4663895..95a4f425aba 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -185,7 +185,7 @@
mod_info can now dump the pre-parsed configuration
to stdout during server startup.
- mod_rewrite
+ mod_rewrite
mod_rewrite adds the [QSD]
(Query String Discard) and [END]
flags for
RewriteRule to
diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index 945ce8a6d37..f93dd4a83ea 100644
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -32,6 +32,7 @@ providing detailed explanations and examples.
CO|cookie
DPI|discardpathinfo
E|env
+
END
F|forbidden
G|gone
H|handler
@@ -261,6 +262,15 @@ CustomLog logs/access_log combined env=!image
an example, not as a recommendation.
+
+
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.
+
+
This does not apply to new requests resulting from external
+redirects.
+
+
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 14086ab03ec..c2d360cbfc6 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -258,7 +258,7 @@ an example, not as a recommendation.
END
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.
+processing from occurring in per-directory (htaccess) context.
This does not apply to new requests resulting from external
redirects.