Sync a few doc with trunk

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

diff --git a/docs/manual/mod/mod_auth_form.xml b/docs/manual/mod/mod_auth_form.xml
index 542fa09c0b772eafb62cad0b0bb19f92bd874e62..60bdeb6541096e987853f1bb72955dd049153a54 100644 (file)
--- a/docs/manual/mod/mod_auth_form.xml
+++ b/docs/manual/mod/mod_auth_form.xml
@@ -118,11 +118,13 @@ SessionCryptoPassphrase secret
       provide their usename and password.</p>
 
       <example><title>Example login form</title>
-        &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 />
+        <highlight language="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;
+        </highlight>
       </example>
 
       <p>The part that does the actual login is handled by the <var>form-login-handler</var>.
@@ -157,14 +159,14 @@ SessionCryptoPassphrase secret
       reused for different areas of a website.</p>
 
       <example><title>Example login form with location</title>
-        &lt;form method="POST" action="/dologin.html"&gt;<br />
-        <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 />
-        </indent>
-        &lt;/form&gt;<br />
+        <highlight language="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;
+        </highlight>
       </example>
 
     </section>
@@ -216,13 +218,13 @@ SessionCryptoPassphrase secret
       URL is.</p>
 
       <example><title>Example inline login form</title>
-        &lt;form method="POST" <strong>action=""</strong>&gt;<br />
-        <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 />
-        </indent>
-        &lt;/form&gt;<br />
+<highlight language="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;
+</highlight>
       </example>
 
       <p>When the end user has filled in their login details, the form will make
@@ -252,16 +254,16 @@ SessionCryptoPassphrase secret
       per the example below.</p>
 
       <example><title>Example with body preservation</title>
-        &lt;form method="POST" action=""&gt;<br />
-        <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 />
-        </indent>
-        &lt;/form&gt;
+        <highlight language="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;
+        </highlight>
       </example>
 
       <p>How the method, mimetype and body of the original request are embedded within the

diff --git a/docs/manual/mod/mod_authn_dbd.xml b/docs/manual/mod/mod_authn_dbd.xml
index 5cf4dd2ee85917740d70844d1eaf0a70b153a887..69211cbed1e1a80523078bc54d76c3b51f0e7cb2 100644 (file)
--- a/docs/manual/mod/mod_authn_dbd.xml
+++ b/docs/manual/mod/mod_authn_dbd.xml
@@ -165,7 +165,7 @@ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
 
 <usage>
     <p>The <directive>AuthDBDUserRealmQuery</directive> 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_macro.xml b/docs/manual/mod/mod_macro.xml
index f88cbf5416a27d9255e0e6aec9210f2fa7ec5b7a..c938293cbc661d13a17190759ec2d809510e0882 100644 (file)
--- a/docs/manual/mod/mod_macro.xml
+++ b/docs/manual/mod/mod_macro.xml
@@ -93,7 +93,7 @@ Examples section.</p>
 
 <p>Parameter names should begin with a sigil such as <code>$</code>,
 <code>%</code>, or <code>@</code>, so that they are clearly
-identifiable, and also in order to help deail with interactions with
+identifiable, and also in order to help deal with interactions with
 other directives, such as the core <directive
 module="core">Define</directive> directive. Failure to do so will 
 result in a warning. Nevertheless, you are encouraged to have a good
@@ -232,7 +232,7 @@ UndefMacro DirGroup
 <usage>
     <p>The <directive>Use</directive> directive controls the use of a macro.
     The specified macro is expanded. It must be given the same number of
-    arguments than in the  macro definition. The provided values are
+    arguments as in the  macro definition. The provided values are
     associated to their corresponding initial parameters and are substituted
     before processing.</p>