From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 2 Jan 2017 21:16:15 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.4.26~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a453c7d75c8a646a7cd191e7805d4dc42eff190c;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en
index 6f3d03e7fd5..0624d52de77 100644
--- a/docs/manual/rewrite/remapping.html.en
+++ b/docs/manual/rewrite/remapping.html.en
@@ -191,7 +191,7 @@ Redirect "/docs/" "http://new.example.com/docs/"</pre>
 
 <pre class="prettyprint lang-config">RewriteEngine  on
 RewriteBase    "/~quux/"
-RewriteRule    "^foo\.html$"  "foo.cgi"   [H=<strong>cgi-script</strong>]</pre>
+RewriteRule    "^foo\.html$"  "foo.cgi"  [H=<strong>cgi-script</strong>]</pre>
 
     </dd>
   </dl>
@@ -294,7 +294,7 @@ hostname(s).</p>
 directive:</p>
 
 <pre class="prettyprint lang-config">&lt;If "%{HTTP_HOST} != 'www.example.com'"&gt;
-	Redirect "/" "http://www.example.com/"
+    Redirect "/" "http://www.example.com/"
 &lt;/If&gt;</pre>
 
 
@@ -302,7 +302,7 @@ directive:</p>
 might do the following:</p>
 
 <pre class="prettyprint lang-config">&lt;If "%{SERVER_PROTOCOL} != 'HTTPS'"&gt;
-	Redirect "/admin/" "https://www.example.com/admin/"
+    Redirect "/admin/" "https://www.example.com/admin/"
 &lt;/If&gt;</pre>
 
 
@@ -314,7 +314,7 @@ you might use one of the recipes below.</p>
 <pre class="prettyprint lang-config">RewriteCond "%{HTTP_HOST}"   "!^www\.example\.com" [NC]
 RewriteCond "%{HTTP_HOST}"   "!^$"
 RewriteCond "%{SERVER_PORT}" "!^80$"
-RewriteRule "^/?(.*)         "http://www.example.com:%{SERVER_PORT}/$1" [L,R,NE]</pre>
+RewriteRule "^/?(.*)"        "http://www.example.com:%{SERVER_PORT}/$1" [L,R,NE]</pre>
 
 
 <p>And for a site running on port 80</p>
@@ -625,7 +625,7 @@ of the URL.</dd>
 <p> Many of the solutions in this section will all use the same condition,
 which leaves the matched value in the %2 backreference.  %1 is the beginining
 of the query string (up to the key of intererest), and %3 is the remainder. This
-condition is a bit complex for flexibility and to avoid double '&amp;&amp;' in the 
+condition is a bit complex for flexibility and to avoid double '&amp;&amp;' in the
 substitutions.</p>
 <ul>
   <li>This solution removes the matching key and value:
@@ -656,7 +656,7 @@ RewriteRule "(.*)" - [F]</pre>
 
   <li>This solution shows the reverse of the previous ones, copying
       path components (perhaps PATH_INFO) from the URL into the query string.
-<pre class="prettyprint lang-config"># The desired URL might be /products/kitchen-sink, and the script expects 
+<pre class="prettyprint lang-config"># The desired URL might be /products/kitchen-sink, and the script expects
 # /path?products=kitchen-sink.
 RewriteRule "^/?path/([^/]+)/([^/]+)" "/path?$1=$2" [PT]</pre>
 
diff --git a/docs/manual/rewrite/remapping.xml.fr b/docs/manual/rewrite/remapping.xml.fr
index 68723e92f1b..6b63c875d6c 100644
--- a/docs/manual/rewrite/remapping.xml.fr
+++ b/docs/manual/rewrite/remapping.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1673563 -->
+<!-- English Revision: 1673563:1777005 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/rewrite/remapping.xml.meta b/docs/manual/rewrite/remapping.xml.meta
index fc4dfefebf2..5e5f6e1602e 100644
--- a/docs/manual/rewrite/remapping.xml.meta
+++ b/docs/manual/rewrite/remapping.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>