Docs xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420690 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 43 insertions, 14 deletions

diff --git a/docs/manual/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en
index cbb99f642c..1250b801f0 100644
--- a/docs/manual/programs/htpasswd.html.en
+++ b/docs/manual/programs/htpasswd.html.en
@@ -36,13 +36,16 @@
     just the users listed in the files created by <code>htpasswd</code>. This
     program can only manage usernames and passwords stored in a flat-file. It
     can encrypt and display password information for use in other types of data
-    stores, though. To use a DBM database see <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code>.</p>
+    stores, though. To use a DBM database see <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> or
+    <code class="program"><a href="../programs/htdbm.html">htdbm</a></code>.</p>
 
-    <p><code>htpasswd</code> encrypts passwords using either a version of MD5
-    modified for Apache, or the system's <code>crypt()</code> routine. Files
-    managed by <code>htpasswd</code> may contain both types of passwords; some
-    user records may have MD5-encrypted passwords while others in the same file
-    may have passwords encrypted with <code>crypt()</code>.</p>
+    <p><code>htpasswd</code> encrypts passwords using either bcrypt,
+    a version of MD5 modified for Apache, SHA1, or the system's
+    <code>crypt()</code> routine. Files
+    managed by <code>htpasswd</code> may contain a mixture of different encoding
+    types of passwords; some
+    user records may have bcrypt or MD5-encrypted passwords while others in the
+    same file may have passwords encrypted with <code>crypt()</code>.</p>
 
     <p>This manual page only lists the command line arguments. For details of
     the directives necessary to configure user authentication in
@@ -55,36 +58,50 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#security">Security Considerations</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#restrictions">Restrictions</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="../programs/httpd.html">httpd</a></code></li><li>The scripts in support/SHA1 which come with the
+</ul><h3>See also</h3><ul class="seealso"><li><code class="program"><a href="../programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="../programs/htdbm.html">htdbm</a></code></li><li>The scripts in support/SHA1 which come with the
 distribution.</li></ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="synopsis" id="synopsis">Synopsis</a></h2>
     <p><code><strong>htpasswd</strong>
     [ -<strong>c</strong> ]
-    [ -<strong>m</strong> ]
-    [ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var></code></p>
+    [ -<strong>i</strong> ]
+    [ -<strong>m</strong> |
+      -<strong>B</strong> |
+      -<strong>d</strong> |
+      -<strong>s</strong> |
+      -<strong>p</strong> ]
+    [ -<strong>C</strong> <var>cost</var> ]
+    [ -<strong>D</strong> ]  <var>passwdfile</var> <var>username</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>b</strong>
     [ -<strong>c</strong> ]
     [ -<strong>m</strong> |
+      -<strong>B</strong> |
       -<strong>d</strong> |
-      -<strong>p</strong> |
-      -<strong>s</strong> ]
+      -<strong>s</strong> |
+      -<strong>p</strong> ]
+    [ -<strong>C</strong> <var>cost</var> ]
     [ -<strong>D</strong> ]  <var>passwdfile</var> <var>username</var>
     <var>password</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>n</strong>
+    [ -<strong>i</strong> ]
     [ -<strong>m</strong> |
+      -<strong>B</strong> |
       -<strong>d</strong> |
       -<strong>s</strong> |
-      -<strong>p</strong> ] <var>username</var></code></p>
+      -<strong>p</strong> ]
+    [ -<strong>C</strong> <var>cost</var> ] <var>username</var></code></p>
 
     <p><code><strong>htpasswd</strong> -<strong>nb</strong>
     [ -<strong>m</strong> |
+      -<strong>B</strong> |
       -<strong>d</strong> |
       -<strong>s</strong> |
-      -<strong>p</strong> ] <var>username</var> <var>password</var></code></p>
+      -<strong>p</strong> ]
+    [ -<strong>C</strong> <var>cost</var> ] <var>username</var>
+    <var>password</var></code></p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="options" id="options">Options</a></h2>
@@ -93,7 +110,10 @@ distribution.</li></ul><ul class="seealso"><li><a href="#comments_section">Comme
     <dd>Use batch mode; <em>i.e.</em>, get the password from the command line
     rather than prompting for it. This option should be used with extreme care,
     since <strong>the password is clearly visible</strong> on the command
-    line.</dd>
+    line. For script use see the <code>-i</code> option.</dd>
+
+    <dt><code>-i</code></dt>
+    <dd>Read the password from stdin without verification (for script usage).</dd>
 
     <dt><code>-c</code></dt>
     <dd>Create the <var>passwdfile</var>. If <var>passwdfile</var> already
@@ -110,6 +130,15 @@ distribution.</li></ul><ul class="seealso"><li><a href="#comments_section">Comme
     <dt><code>-m</code></dt>
     <dd>Use MD5 encryption for passwords. This is the default.</dd>
 
+    <dt><code>-B</code></dt>
+    <dd>Use bcrypt encryption for passwords. This is currently considered to
+    be very secure.</dd>
+
+    <dt><code>-C</code></dt>
+    <dd>This flag is only allowed in combination with <code>-B</code> (bcrypt
+    encryption). It sets the computing time used for the bcrypt algorithm
+    (higher is more secure but slower, default: 5, valid: 4 to 31).</dd>
+
     <dt><code>-d</code></dt>
     <dd>Use <code>crypt()</code> encryption for passwords. This is not
     supported by the <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and