From: Daniel Gruno <humbedooh@apache.org>
Date: Fri, 5 Oct 2012 22:05:01 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~6233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=221ebf873dc1578b977f955ce2a159f29f57c900;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en
index d01b516d976..35be27d2ae4 100644
--- a/docs/manual/rewrite/flags.html.en
+++ b/docs/manual/rewrite/flags.html.en
@@ -641,10 +641,12 @@ URI in request' warnings.
 <p>The [S] flag is used to skip rules that you don't want to run. The 
 syntax of the skip flag is [S=<em>N</em>], where <em>N</em> signifies 
 the number of rules to skip (provided the <code class="directive"><a href="../mod/mod_rewrite.html#&#10;rewriterule">
-RewriteRule</a></code> matches). This can be thought of as a <code>goto</code> 
-statement in your rewrite ruleset. In the following example, we only want 
-to run the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> if the 
-requested URI doesn't correspond with an actual file.</p>
+RewriteRule</a></code> and any preceding <code class="directive"><a href="../mod/mod_rewrite.html#&#10;rewritecond">
+RewriteCond</a></code> directives match). This can be thought of as a 
+<code>goto</code> statement in your rewrite ruleset. In the following 
+example, we only want to run the <code class="directive"><a href="../mod/mod_rewrite.html#&#10;rewriterule">
+RewriteRule</a></code> if the requested URI doesn't correspond with an 
+actual file.</p>
 
 <pre class="prettyprint lang-config">
 # Is the request for a non-existent file?
diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index 3c52efc6e83..9f8d3077bef 100644
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1379311 -->
+<!-- English Revision: 1379311:1394837 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index 912229af035..e4f3ee6f495 100644
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>