From 561b739c98ace18cc132c9b10d98e2023a861481 Mon Sep 17 00:00:00 2001
From: Jeff Trawick <trawick@apache.org>
Date: Mon, 6 Jan 2014 16:05:52 +0000
Subject: [PATCH] xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555879 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.xml.de            |  2 +-
 docs/manual/mod/core.xml.es            |  2 +-
 docs/manual/mod/core.xml.fr            |  2 +-
 docs/manual/mod/core.xml.ja            |  2 +-
 docs/manual/mod/core.xml.tr            |  2 +-
 docs/manual/mod/mod_auth_form.html.en  | 74 +++++++++++++-------------
 docs/manual/mod/mod_auth_form.xml.fr   |  2 +-
 docs/manual/mod/mod_auth_form.xml.meta |  2 +-
 docs/manual/mod/mod_authn_dbd.html.en  |  2 +-
 docs/manual/mod/mod_authn_dbd.xml.fr   |  2 +-
 docs/manual/mod/mod_authn_dbd.xml.meta |  2 +-
 docs/manual/mod/mod_macro.xml.fr       |  2 +-
 docs/manual/mod/mod_ssl.xml.fr         |  2 +-
 13 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 5d249f42bd..902e34dbd3 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:1555551 (outdated) -->
+<!-- English Revision: 344972:1555571 (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 652a09f9c0..a5d52d0f6b 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:1555551 (outdated) -->
+<!-- English Revision: 1040494:1555571 (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 0b9be6163d..55c95cf7d1 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: 1544630:1555551 (outdated) -->
+<!-- English Revision: 1544630:1555571 (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 7ded71e4b1..0d43fd298b 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:1555551 (outdated) -->
+<!-- English Revision: 669847:1555571 (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 ba04fcdc58..e9a31d0d02 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: 1450091:1555551 (outdated) -->
+<!-- English Revision: 1450091:1555571 (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/mod/mod_auth_form.html.en b/docs/manual/mod/mod_auth_form.html.en
index c8b7a5cb55..d40e4c3d11 100644
--- a/docs/manual/mod/mod_auth_form.html.en
+++ b/docs/manual/mod/mod_auth_form.html.en
@@ -150,13 +150,14 @@ SessionCryptoPassphrase secret
       directive. Typically this login page will contain an HTML form, asking the user to
       provide their usename and password.</p>
 
-      <div class="example"><h3>Example login form</h3><p><code>
-        &lt;form method="POST" action="/dologin.html"&gt;<br />
-        Username: &lt;input type="text" name="httpd_username" value="" /&gt;<br />
-        Password: &lt;input type="password" name="httpd_password" value="" /&gt;<br />
-        &lt;input type="submit" name="login" value="Login" /&gt;<br />
-        &lt;/form&gt;<br />
-      </code></p></div>
+      <div class="example"><h3>Example login form</h3><pre class="prettyprint lang-html">
+&lt;form method="POST" action="/dologin.html"&gt;
+  Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+  Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+  &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;
+        </pre>
+</div>
 
       <p>The part that does the actual login is handled by the <var>form-login-handler</var>.
       The action of the form should point at this handler, which is configured within
@@ -188,16 +189,15 @@ SessionCryptoPassphrase secret
       form, as in the example below. As a result, the same <var>form-login-handler</var> can be
       reused for different areas of a website.</p>
 
-      <div class="example"><h3>Example login form with location</h3><p><code>
-        &lt;form method="POST" action="/dologin.html"&gt;<br />
-        <span class="indent">
-          Username: &lt;input type="text" name="httpd_username" value="" /&gt;<br />
-          Password: &lt;input type="password" name="httpd_password" value="" /&gt;<br />
-          &lt;input type="submit" name="login" value="Login" /&gt;<br />
-          &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;<br />
-        </span>
-        &lt;/form&gt;<br />
-      </code></p></div>
+      <div class="example"><h3>Example login form with location</h3><pre class="prettyprint lang-html">
+&lt;form method="POST" action="/dologin.html"&gt;
+  Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+  Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+  &lt;input type="submit" name="login" value="Login" /&gt;
+  &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;
+&lt;/form&gt;
+        </pre>
+</div>
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -246,15 +246,14 @@ SessionCryptoPassphrase secret
       the original protected URL, without the page having to know what that
       URL is.</p>
 
-      <div class="example"><h3>Example inline login form</h3><p><code>
-        &lt;form method="POST" <strong>action=""</strong>&gt;<br />
-        <span class="indent">
-          Username: &lt;input type="text" name="httpd_username" value="" /&gt;<br />
-          Password: &lt;input type="password" name="httpd_password" value="" /&gt;<br />
-          &lt;input type="submit" name="login" value="Login" /&gt;<br />
-        </span>
-        &lt;/form&gt;<br />
-      </code></p></div>
+      <div class="example"><h3>Example inline login form</h3><pre class="prettyprint lang-html">
+&lt;form method="POST" <strong>action=""</strong>&gt;
+  Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+  Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+  &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;
+</pre>
+</div>
 
       <p>When the end user has filled in their login details, the form will make
       an HTTP POST request to the original password protected URL.
@@ -282,18 +281,17 @@ SessionCryptoPassphrase secret
       <p>To enable body preservation, add three additional fields to the login form as
       per the example below.</p>
 
-      <div class="example"><h3>Example with body preservation</h3><p><code>
-        &lt;form method="POST" action=""&gt;<br />
-        <span class="indent">
-          Username: &lt;input type="text" name="httpd_username" value="" /&gt;<br />
-          Password: &lt;input type="password" name="httpd_password" value="" /&gt;<br />
-          &lt;input type="submit" name="login" value="Login" /&gt;<br />
-          <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;<br />
-          &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;<br />
-          &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
-        </span>
-        &lt;/form&gt;
-      </code></p></div>
+      <div class="example"><h3>Example with body preservation</h3><pre class="prettyprint lang-html">
+&lt;form method="POST" action=""&gt;
+  Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+  Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+  &lt;input type="submit" name="login" value="Login" /&gt;
+  <br />  <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;
+  &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;
+  &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
+&lt;/form&gt;
+        </pre>
+</div>
 
       <p>How the method, mimetype and body of the original request are embedded within the
       login form will depend on the platform and technology being used within the website.
diff --git a/docs/manual/mod/mod_auth_form.xml.fr b/docs/manual/mod/mod_auth_form.xml.fr
index 6fc73cc5a1..424c0d45c6 100644
--- a/docs/manual/mod/mod_auth_form.xml.fr
+++ b/docs/manual/mod/mod_auth_form.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 : 1427185 -->
+<!-- English Revision: 1427185:1555605 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_auth_form.xml.meta b/docs/manual/mod/mod_auth_form.xml.meta
index 66a7abbcd2..ff178f6df2 100644
--- a/docs/manual/mod/mod_auth_form.xml.meta
+++ b/docs/manual/mod/mod_auth_form.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index 57fe080869..f4be5706cd 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -183,7 +183,7 @@ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authn_dbd</td></tr>
 </table>
     <p>The <code class="directive">AuthDBDUserRealmQuery</code> specifies an
-    SQL query to look up a password for a specified user and realm in a 
+    SQL query to look up a password for a specified user and realm in a
     digest authentication process.
     The user's ID and the realm, in that order, will be passed as string
     parameters when the SQL query is executed.  They may be referenced
diff --git a/docs/manual/mod/mod_authn_dbd.xml.fr b/docs/manual/mod/mod_authn_dbd.xml.fr
index 525b4141ca..2ccb81d424 100644
--- a/docs/manual/mod/mod_authn_dbd.xml.fr
+++ b/docs/manual/mod/mod_authn_dbd.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 : 1387659 -->
+<!-- English Revision: 1387659:1555605 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_authn_dbd.xml.meta b/docs/manual/mod/mod_authn_dbd.xml.meta
index f386804ad0..5894513f59 100644
--- a/docs/manual/mod/mod_authn_dbd.xml.meta
+++ b/docs/manual/mod/mod_authn_dbd.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_macro.xml.fr b/docs/manual/mod/mod_macro.xml.fr
index 3f67b8e8f0..a883577a2f 100644
--- a/docs/manual/mod/mod_macro.xml.fr
+++ b/docs/manual/mod/mod_macro.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: 1542330:1555551 (outdated) -->
+<!-- English Revision: 1542330:1555605 (outdated) -->
 <!-- French translation: Fabien Coelho -->
 <!-- Updated by Lucien Gentis -->
 
diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr
index 18ec407196..6b2216139a 100644
--- a/docs/manual/mod/mod_ssl.xml.fr
+++ b/docs/manual/mod/mod_ssl.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: 1542327:1555683 (outdated) -->
+<!-- English Revision: 1542327:1555876 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
-- 
2.40.0