From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 27 May 2016 20:22:49 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.4.21~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=732a50a1e731e38976e9235eecbc3f3c3fd2b1a2;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index 55f23747ffc..0ca1067ca15 100644
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -36,13 +36,13 @@
     out of the home directory of the user "<code>username</code>", out of
     the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>
 <p>Note that, by default, access to these directories is <strong>not</strong>
-    enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line</p>
-    <div class="example"><p><code>
-      #Include conf/extra/httpd-userdir.conf
-    </code></p></div>
+    enabled. You can enable access when using <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> by uncommenting the line:</p>
+    <pre class="prettyprint lang-config">#Include conf/extra/httpd-userdir.conf</pre>
+
     <p>in the default config file <code>conf/httpd.conf</code>, and adapting the <code>httpd-userdir.conf</code>
     file as necessary, or by including the appropriate directives in a
-    <code>Directory</code> block within the main config file.</p>
+    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> block
+    within the main config file.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li>
diff --git a/docs/manual/howto/public_html.xml.fr b/docs/manual/howto/public_html.xml.fr
index 3aa7b646fe8..ae9997829af 100644
--- a/docs/manual/howto/public_html.xml.fr
+++ b/docs/manual/howto/public_html.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1741841 -->
+<!-- English Revision: 1741841:1745806 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja
index d4ef0ec4146..1c5d7d20053 100644
--- a/docs/manual/howto/public_html.xml.ja
+++ b/docs/manual/howto/public_html.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: 1591193:1741841 (outdated) -->
+<!-- English Revision: 1591193:1745806 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.ko b/docs/manual/howto/public_html.xml.ko
index ac8f1903d8f..50c66ab17d0 100644
--- a/docs/manual/howto/public_html.xml.ko
+++ b/docs/manual/howto/public_html.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:1741841 (outdated) -->
+<!-- English Revision: 151408:1745806 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.meta b/docs/manual/howto/public_html.xml.meta
index 224e3019cd8..cae6f7cca8c 100644
--- a/docs/manual/howto/public_html.xml.meta
+++ b/docs/manual/howto/public_html.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/howto/public_html.xml.tr b/docs/manual/howto/public_html.xml.tr
index 5aa4eb21062..aa1e8693c6f 100644
--- a/docs/manual/howto/public_html.xml.tr
+++ b/docs/manual/howto/public_html.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: 1673563:1741841 (outdated) -->
+<!-- English Revision: 1673563:1745806 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>
diff --git a/docs/manual/howto/reverse_proxy.html.en b/docs/manual/howto/reverse_proxy.html.en
index 9783d0f2beb..ea76471fc46 100644
--- a/docs/manual/howto/reverse_proxy.html.en
+++ b/docs/manual/howto/reverse_proxy.html.en
@@ -119,7 +119,7 @@ ProxyPassReverse "/images"  "http://www.example.com/"</pre>
       requests and for the reverse proxy to load balance and failover among
       them. This group is sometimes called a <em>cluster</em> but Apache httpd's
       term is a <em>balancer</em>. One defines a balancer by leveraging the
-      <code class="directive"><a href="../mod/mod_proxy.html#proxy">Proxy</a></code> and
+      <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> and
       <code class="directive"><a href="../mod/mod_proxy.html#balancermember">BalancerMember</a></code> directives as
       shown:
     </p>
@@ -235,7 +235,7 @@ ProxyPassReverse "/images/"  "balancer://myset/"</pre>
 
 
     <div class="warning"><h3>Warning</h3>
-      <p>Do not enable the <em>balancer-manager</em> until you have <a href="mod_proxy.html#access">secured your server</a>. In
+      <p>Do not enable the <em>balancer-manager</em> until you have <a href="../mod/mod_proxy.html#access">secured your server</a>. In
       particular, ensure that access to the URL is tightly
       restricted.</p>
     </div>
diff --git a/docs/manual/mod/mod_userdir.html.en b/docs/manual/mod/mod_userdir.html.en
index a2827cc89e0..8944ef401d3 100644
--- a/docs/manual/mod/mod_userdir.html.en
+++ b/docs/manual/mod/mod_userdir.html.en
@@ -93,7 +93,7 @@ tutorial</a></li>
 
     <p>If neither the <code>enabled</code> nor the
     <code>disabled</code> keywords appear in the
-    <code>Userdir</code> directive, the argument is treated as a
+    <code class="directive">Userdir</code> directive, the argument is treated as a
     filename pattern, and is used to turn the name into a directory
     specification. A request for
     <code>http://www.example.com/~bob/one/two.html</code> will be
@@ -150,7 +150,7 @@ UserDir enabled user1 user2 user3</pre>
     <p>It is also possible to specify alternative user directories.
     If you use a command like:</p>
 
-    <pre class="prettyprint lang-config">UserDir public_html /usr/web http://www.example.com/</pre>
+    <pre class="prettyprint lang-config">UserDir "public_html" "/usr/web" "http://www.example.com/"</pre>
 
 
     <p>With a request for
@@ -166,7 +166,7 @@ UserDir enabled user1 user2 user3</pre>
 
     <p>User directory substitution is not active by default in versions
     2.1.4 and later.  In earlier versions, <code>UserDir public_html</code>
-    was assumed if no <code class="directive"><a href="#userdir">UserDir</a></code>
+    was assumed if no <code class="directive">UserDir</code>
     directive was present.</p>
 
     <div class="note"><h3>Merging details</h3>
diff --git a/docs/manual/mod/mod_userdir.xml.fr b/docs/manual/mod/mod_userdir.xml.fr
index 69fff78a07c..dc254843c49 100644
--- a/docs/manual/mod/mod_userdir.xml.fr
+++ b/docs/manual/mod/mod_userdir.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 : 1334026 -->
+<!-- English Revision: 1334026:1745806 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_userdir.xml.ja b/docs/manual/mod/mod_userdir.xml.ja
index b63288a531c..e4f58a2b46d 100644
--- a/docs/manual/mod/mod_userdir.xml.ja
+++ b/docs/manual/mod/mod_userdir.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: 657842:1334026 (outdated) -->
+<!-- English Revision: 657842:1745806 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_userdir.xml.ko b/docs/manual/mod/mod_userdir.xml.ko
index 3b64a51d73d..7700803ce27 100644
--- a/docs/manual/mod/mod_userdir.xml.ko
+++ b/docs/manual/mod/mod_userdir.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:1334026 (outdated) -->
+<!-- English Revision: 151408:1745806 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_userdir.xml.meta b/docs/manual/mod/mod_userdir.xml.meta
index 3abbbb32972..174168e57d3 100644
--- a/docs/manual/mod/mod_userdir.xml.meta
+++ b/docs/manual/mod/mod_userdir.xml.meta
@@ -8,9 +8,9 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_userdir.xml.tr b/docs/manual/mod/mod_userdir.xml.tr
index f597dd30384..3211b762a1b 100644
--- a/docs/manual/mod/mod_userdir.xml.tr
+++ b/docs/manual/mod/mod_userdir.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: 1334026 -->
+<!-- English Revision: 1334026:1745806 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
    Reviewed by: Orhan Berent <berent belgeler.gen.tr>