From: Daniel Gruno <humbedooh@apache.org>
Date: Sun, 22 Jul 2012 14:44:35 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~6601
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b63283aacd7a25c94ec372e3bbe710d71d77b5fb;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index aebb80bac94..30b0489359b 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -88,7 +88,7 @@ Negotiation</a></li>
     <p>httpd supports 'server driven' content negotiation, as
     defined in the HTTP/1.1 specification. It fully supports the
     <code>Accept</code>, <code>Accept-Language</code>,
-    <code>Accept-Charset</code> and<code>Accept-Encoding</code>
+    <code>Accept-Charset</code> and <code>Accept-Encoding</code>
     request headers. httpd also supports 'transparent'
     content negotiation, which is an experimental negotiation
     protocol defined in RFC 2295 and RFC 2296. It does not offer
diff --git a/docs/manual/content-negotiation.html.fr b/docs/manual/content-negotiation.html.fr
index f5bcb7fbebc..fc1ea95d1d5 100644
--- a/docs/manual/content-negotiation.html.fr
+++ b/docs/manual/content-negotiation.html.fr
@@ -27,6 +27,8 @@
 <a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/content-negotiation.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 
     <p>Apache HTTPD supporte la négociation de
diff --git a/docs/manual/content-negotiation.xml.fr b/docs/manual/content-negotiation.xml.fr
index e3c6c654544..f645ca1a35a 100644
--- a/docs/manual/content-negotiation.xml.fr
+++ b/docs/manual/content-negotiation.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1331584 -->
+<!-- English Revision: 1331584:1364312 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja
index a29abc1b09f..feaa993bb51 100644
--- a/docs/manual/content-negotiation.xml.ja
+++ b/docs/manual/content-negotiation.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 675610:1331584 (outdated) -->
+<!-- English Revision: 675610:1364312 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/content-negotiation.xml.ko b/docs/manual/content-negotiation.xml.ko
index c2309ea27ce..0ac426f15f6 100644
--- a/docs/manual/content-negotiation.xml.ko
+++ b/docs/manual/content-negotiation.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1331584 (outdated) -->
+<!-- English Revision: 151408:1364312 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/content-negotiation.xml.meta b/docs/manual/content-negotiation.xml.meta
index d9d19c5db37..5ebb3ced683 100644
--- a/docs/manual/content-negotiation.xml.meta
+++ b/docs/manual/content-negotiation.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/content-negotiation.xml.tr b/docs/manual/content-negotiation.xml.tr
index 5233988f0e1..a0ceb2c0f48 100644
--- a/docs/manual/content-negotiation.xml.tr
+++ b/docs/manual/content-negotiation.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1331584 (outdated) -->
+<!-- English Revision: 1174747:1364312 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/getting-started.html.en b/docs/manual/getting-started.html.en
index 4d6587611a8..46a42350aa2 100644
--- a/docs/manual/getting-started.html.en
+++ b/docs/manual/getting-started.html.en
@@ -124,7 +124,7 @@ for ease of management. These files are loaded via the <code class="directive"><
 these sub-files are not magical, and may vary greatly from one
 installation to another. Arrange and subdivide these files as
 makes the most sense to <strong>you</strong>. If the file arrangement
-you have by default doesn't make sense to you, feel free to rerrange it.</p>
+you have by default doesn't make sense to you, feel free to rearrange it.</p>
 
 <p>The server is configured by placing <a href="mod/quickreference.html">configuration directives</a> in these
 configuration files. A directive is a keyword followed by one or more
@@ -156,7 +156,7 @@ divided into static and dynamic content.</p>
 <p>Static content is things like HTML files, image files, CSS files,
 and other files that reside in the filesystem. The <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> directive specifies where in your
 filesystem you should place these files. This directive is either set
-globally, or per virual host. Look in your configuration file(s) to
+globally, or per virtual host. Look in your configuration file(s) to
 determine how this is set for your server.</p>
 
 <p>Typically, a document called <code>index.html</code> will be served
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 115b8ff5564..d64d1d07940 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1450,7 +1450,7 @@ ErrorLogFormat "[%t] [%l] [pid %P] %F: %E: [client %a] %M"
     format <code>[%t] [%l] [%a] %M&nbsp;</code> is not available, the surrounding
     brackets are not logged either.  Space characters can be escaped with a
     backslash to prevent them from delimiting a field.  The combination '%&nbsp;'
-    (percent space) is a zero-witdh field delimiter that does not produce any
+    (percent space) is a zero-width field delimiter that does not produce any
     output.</p>
 
     <p>The above behavior can be changed by adding modifiers to the format
@@ -3376,9 +3376,11 @@ directory</td></tr>
       <div class="note">
       <p>Even though the server follows the symlink it does <em>not</em>
       change the pathname used to match against <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> sections.</p>
-      <p>Note also, that this option <strong>gets ignored</strong> if set
-      inside a <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
-      section.</p>
+
+      <p>The <code>FollowSymLinks</code> and
+      <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> sections or
+      <code>.htaccess</code> files.</p>
+
       <p>Omitting this option should not be considered a security restriction,
       since symlink testing is subject to race conditions that make it
       circumventable.</p>
@@ -3426,12 +3428,15 @@ directory</td></tr>
       target file or directory is owned by the same user id as the
       link.
 
-      <div class="note"><h3>Note</h3> <p>This option gets ignored if
-      set inside a <code class="directive"><a href="#location">&lt;Location&gt;</a></code> section.</p>
+      <div class="note"><h3>Note</h3>
+      <p>The <code>FollowSymLinks</code> and
+      <code>SymLinksIfOwnerMatch</code> <code class="directive"><a href="#options">Options</a></code> work only in <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> sections or
+      <code>.htaccess</code> files.</p>
+
       <p>This option should not be considered a security restriction,
       since symlink testing is subject to race conditions that make it
-      circumventable.</p></div>
-      </dd>
+      circumventable.</p>
+      </div> </dd>
     </dl>
 
     <p>Normally, if multiple <code class="directive">Options</code> could
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index e9dbac6fcd3..fbcd8dd42c5 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1363515 (outdated) -->
+<!-- English Revision: 344972:1364309 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 118d5faa341..1676c7b5ebb 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1363515 (outdated) -->
+<!-- English Revision: 1040494:1364309 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index c91e69dfbd8..742c757aa53 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1357168:1363515 (outdated) -->
+<!-- English Revision: 1357168:1364309 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index f8ce056629e..bca8508b200 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1363515 (outdated) -->
+<!-- English Revision: 669847:1364309 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 8a8213fbbf1..f3d4451028b 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.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: 1302855:1363515 (outdated) -->
+<!-- English Revision: 1302855:1364309 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index ee1445e4531..b90648d53a5 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -472,7 +472,7 @@ are interpreted, it is important to understand how this works.</p>
     order.</p>
 
     <p>Later sections override earlier ones, however each module is responsible
-    for interpeting what form this override takes.  A later configuration section 
+    for interpreting what form this override takes.  A later configuration section 
     with directives from a given module might cause a conceptual "merge" of some
     directives, all directives, or a complete replacement of the modules 
     configuration with the module defaults and directives explicitly listed in 
diff --git a/docs/manual/sections.html.fr b/docs/manual/sections.html.fr
index 74b6a9eb7c0..9307e60d0d1 100644
--- a/docs/manual/sections.html.fr
+++ b/docs/manual/sections.html.fr
@@ -27,6 +27,8 @@
 <a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
  <p>Les directives des <a href="configuring.html">fichiers de configuration</a> peuvent s'appliquer
 au serveur dans son ensemble, ou seulement à des répertoires, fichiers, hôtes,
 ou URLs particuliers.  Ce document décrit comment utiliser les conteneurs de
diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr
index f4afedc2af8..55ceecc8b86 100644
--- a/docs/manual/sections.xml.fr
+++ b/docs/manual/sections.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision : 1337465 -->
+<!-- English Revision: 1337465:1364306 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja
index b5758b4eb8c..ebe7dc49468 100644
--- a/docs/manual/sections.xml.ja
+++ b/docs/manual/sections.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1337465 (outdated) -->
+<!-- English Revision: 420990:1364306 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko
index 35fcf230a03..0130692a617 100644
--- a/docs/manual/sections.xml.ko
+++ b/docs/manual/sections.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1337465 (outdated) -->
+<!-- English Revision: 105989:1364306 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.meta b/docs/manual/sections.xml.meta
index f5ac84359d4..0e839c6dc7f 100644
--- a/docs/manual/sections.xml.meta
+++ b/docs/manual/sections.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/sections.xml.tr b/docs/manual/sections.xml.tr
index c9ac4563b05..9ea200b02e9 100644
--- a/docs/manual/sections.xml.tr
+++ b/docs/manual/sections.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1300910:1337465 (outdated) -->
+<!-- English Revision: 1300910:1364306 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>