xforms

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

diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 565d4ad3fecca8b70992011d550550c38e748229..11248037e3f200ab079c29f16897fd4cf34781d0 100644 (file)
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -302,7 +302,7 @@ a different URL</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_alias</td></tr>
 </table>
-    <p>The Redirect directive maps an old URL into a new one by asking
+    <p>The <code class="directive">Redirect</code> directive maps an old URL into a new one by asking
     the client to refetch the resource at the new location.</p>
 
     <p>The old <em>URL-path</em> is a case-sensitive (%-decoded) path
@@ -313,10 +313,10 @@ a different URL</td></tr>
     In this latter case the scheme and hostname of the current server will
     be added.</p>
 
-    <p>Then any request beginning with <em>URL-Path</em> will return a
+    <p>Then any request beginning with <em>URL-path</em> will return a
     redirect request to the client at the location of the target
     <em>URL</em>.  Additional path information beyond the matched
-    <em>URL-Path</em> will be appended to the target URL.</p>
+    <em>URL-path</em> will be appended to the target URL.</p>
 
     <pre class="prettyprint lang-config"># Redirect to a URL on a different host
 Redirect "/service" "http://foo2.example.com/service"
@@ -342,10 +342,11 @@ Redirect "/one" "/two"</pre>
 
 
     <div class="note"><h3>Note</h3>
-    <p>Redirect directives take precedence over Alias and ScriptAlias
+    <p><code class="directive">Redirect</code> directives take precedence over <code class="directive"><a href="#alias">Alias</a></code> and <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
     directives, irrespective of their ordering in the configuration
-    file. Redirect directives inside a Location take precedence over
-    Redirect and Alias directives with an URL-path.</p></div>
+    file. <code class="directive">Redirect</code> directives inside a Location take
+    precedence over <code class="directive">Redirect</code> and <code class="directive"><a href="#alias">Alias</a></code> directives with an <var>URL-path</var>.</p>
+    </div>
 
     <p>If no <var>status</var> argument is given, the redirect will
     be "temporary" (HTTP status 302). This indicates to the client
@@ -390,8 +391,8 @@ Redirect 303 "/three" "http://example.com/other"</pre>
     <p>If the <code class="directive">Redirect</code> directive is used within a
     <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
     or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
-    section with the URL-path omitted, then the URL parameter will be
-    interpreted using <a href="../expr.html">expression syntax</a>.<br />
+    section with the <var>URL-path</var> omitted, then the <var>URL</var> parameter
+    will be interpreted using <a href="../expr.html">expression syntax</a>.<br />
     This syntax is available in Apache 2.4.19 and later.</p>
 
     <pre class="prettyprint lang-config">&lt;Location "/one"&gt;

diff --git a/docs/manual/mod/mod_alias.xml.fr b/docs/manual/mod/mod_alias.xml.fr
index 48619f70468bbde9e7118b334bec7fcee9ab7e58..013af1dbea1f671f1642dca6f36b109ff7f842f3 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.fr
+++ b/docs/manual/mod/mod_alias.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1731335 -->
+<!-- English Revision: 1731335:1756706 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index 677e5cbf24430bf71a6e26b191df2539ab6aa45f..5e1a36c4f2480d2625501cc0f4f5bc6ecd2d6715 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:1731335 (outdated) -->
+<!-- English Revision: 151408:1756706 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko
index e7055e6ae9bcd7c74af6e482ce65706ef8c2c343..eb87c3ef98301ca1b669139d100276fd16b2f6ae 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.ko
+++ b/docs/manual/mod/mod_alias.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1731335 (outdated) -->
+<!-- English Revision: 151408:1756706 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_alias.xml.meta b/docs/manual/mod/mod_alias.xml.meta
index 547a2db7730dd46f16c2efb9093f87bd098e5028..d83657f9fafbe81d751ed120da80c0c98357d5ef 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.meta
+++ b/docs/manual/mod/mod_alias.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

diff --git a/docs/manual/mod/mod_alias.xml.tr b/docs/manual/mod/mod_alias.xml.tr
index a22aebfc0080cb91a6778694083636af9c082a56..586ef1acd270961bc754f692e261bceb4bb51bca 100644 (file)
--- a/docs/manual/mod/mod_alias.xml.tr
+++ b/docs/manual/mod/mod_alias.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1731335 (outdated) -->
+<!-- English Revision: 1174747:1756706 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>