Merge r1500323:

add note when default algorithm has been changed

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

diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml
index b452f4f5e7e3f6422a53de7adb45b3931640359a..e5a6af95e5d39cc4318baeefd23c3c74f853d79d 100644 (file)
--- a/docs/manual/programs/htpasswd.xml
+++ b/docs/manual/programs/htpasswd.xml
@@ -126,7 +126,8 @@ distribution.</seealso>
     one) is omitted. It cannot be combined with the <code>-c</code> option.</dd>
 
     <dt><code>-m</code></dt>
-    <dd>Use MD5 encryption for passwords. This is the default.</dd>
+    <dd>Use MD5 encryption for passwords. This is the default (since version
+    2.2.18).</dd>
 
     <dt><code>-B</code></dt>
     <dd>Use bcrypt encryption for passwords. This is currently considered to
@@ -141,7 +142,8 @@ distribution.</seealso>
     <dd>Use <code>crypt()</code> encryption for passwords. This is not
     supported by the <program>httpd</program> server on Windows and
     Netware. This algorithm limits the password length to 8 characters.
-    This algorithm is <strong>insecure</strong> by today's standards.</dd>
+    This algorithm is <strong>insecure</strong> by today's standards.
+    It used to be the default algorithm until version 2.2.17.</dd>
 
     <dt><code>-s</code></dt>
     <dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape