You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/01/05 19:33:42 UTC

svn commit: r1555605 - in /httpd/httpd/branches/2.4.x/docs/manual/mod: mod_auth_form.xml mod_authn_dbd.xml mod_macro.xml

Author: jailletc36
Date: Sun Jan  5 18:33:42 2014
New Revision: 1555605

URL: http://svn.apache.org/r1555605
Log:
Sync a few doc with trunk

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_dbd.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml?rev=1555605&r1=1555604&r2=1555605&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_auth_form.xml Sun Jan  5 18:33:42 2014
@@ -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

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_dbd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_dbd.xml?rev=1555605&r1=1555604&r2=1555605&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_dbd.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_dbd.xml Sun Jan  5 18:33:42 2014
@@ -165,7 +165,7 @@ AuthDBDUserPWQuery "SELECT password FROM
 
 <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

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml?rev=1555605&r1=1555604&r2=1555605&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml Sun Jan  5 18:33:42 2014
@@ -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>