From a087b3205d24ba1d839e27ac3d82cd42b31281a4 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sun, 5 Jan 2014 18:33:42 +0000 Subject: [PATCH] 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 --- docs/manual/mod/mod_auth_form.xml | 62 ++++++++++++++++--------------- docs/manual/mod/mod_authn_dbd.xml | 2 +- docs/manual/mod/mod_macro.xml | 4 +- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/docs/manual/mod/mod_auth_form.xml b/docs/manual/mod/mod_auth_form.xml index 542fa09c0b..60bdeb6541 100644 --- 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.

Example login form - <form method="POST" action="/dologin.html">
- Username: <input type="text" name="httpd_username" value="" />
- Password: <input type="password" name="httpd_password" value="" />
- <input type="submit" name="login" value="Login" />
- </form>
+ +<form method="POST" action="/dologin.html"> + Username: <input type="text" name="httpd_username" value="" /> + Password: <input type="password" name="httpd_password" value="" /> + <input type="submit" name="login" value="Login" /> +</form> +

The part that does the actual login is handled by the form-login-handler. @@ -157,14 +159,14 @@ SessionCryptoPassphrase secret reused for different areas of a website.

Example login form with location - <form method="POST" action="/dologin.html">
- - Username: <input type="text" name="httpd_username" value="" />
- Password: <input type="password" name="httpd_password" value="" />
- <input type="submit" name="login" value="Login" />
- <input type="hidden" name="httpd_location" value="http://example.com/success.html" />
- - </form>
+ +<form method="POST" action="/dologin.html"> + Username: <input type="text" name="httpd_username" value="" /> + Password: <input type="password" name="httpd_password" value="" /> + <input type="submit" name="login" value="Login" /> + <input type="hidden" name="httpd_location" value="http://example.com/success.html" /> +</form> + @@ -216,13 +218,13 @@ SessionCryptoPassphrase secret URL is.

Example inline login form - <form method="POST" action="">
- - Username: <input type="text" name="httpd_username" value="" />
- Password: <input type="password" name="httpd_password" value="" />
- <input type="submit" name="login" value="Login" />
- - </form>
+ +<form method="POST" action=""> + Username: <input type="text" name="httpd_username" value="" /> + Password: <input type="password" name="httpd_password" value="" /> + <input type="submit" name="login" value="Login" /> +</form> +

When the end user has filled in their login details, the form will make @@ -252,16 +254,16 @@ SessionCryptoPassphrase secret per the example below.

Example with body preservation - <form method="POST" action="">
- - Username: <input type="text" name="httpd_username" value="" />
- Password: <input type="password" name="httpd_password" value="" />
- <input type="submit" name="login" value="Login" />
- <input type="hidden" name="httpd_method" value="POST" />
- <input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" />
- <input type="hidden" name="httpd_body" value="name1=value1&name2=value2" />
- - </form> + +<form method="POST" action=""> + Username: <input type="text" name="httpd_username" value="" /> + Password: <input type="password" name="httpd_password" value="" /> + <input type="submit" name="login" value="Login" /> +
<input type="hidden" name="httpd_method" value="POST" /> + <input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /> + <input type="hidden" name="httpd_body" value="name1=value1&name2=value2" />
+</form> +

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 5cf4dd2ee8..69211cbed1 100644 --- 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"

The AuthDBDUserRealmQuery 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 f88cbf5416..c938293cbc 100644 --- a/docs/manual/mod/mod_macro.xml +++ b/docs/manual/mod/mod_macro.xml @@ -93,7 +93,7 @@ Examples section.

Parameter names should begin with a sigil such as $, %, or @, 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 Define directive. Failure to do so will result in a warning. Nevertheless, you are encouraged to have a good @@ -232,7 +232,7 @@ UndefMacro DirGroup

The Use 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.

-- 2.40.0