Adding upstream version 2.4.59.upstream/2.4.59upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 13 deletions

diff --git a/docs/manual/programs/htdbm.html.en b/docs/manual/programs/htdbm.html.en
index 00aa52d..5eb9e5c 100644
--- a/docs/manual/programs/htdbm.html.en
+++ b/docs/manual/programs/htdbm.html.en
@@ -155,27 +155,27 @@
     cannot be combined with the <code>-c</code> option.</dd>
 
     <dt><code>-m</code></dt>
-    <dd>Use MD5 encryption for passwords. On Windows and Netware, this is
+    <dd>Use MD5 hashing for passwords. On Windows and Netware, this is
     the default.</dd>
 
     <dt><code>-B</code></dt>
-    <dd>Use bcrypt encryption for passwords. This is currently considered to
+    <dd>Use bcrypt hashing 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
+    hashing). 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. The default on all
+    <dd>Use <code>crypt()</code> hashing for passwords. The default on all
     platforms but Windows and Netware. Though possibly supported by
     <code>htdbm</code> on all platforms, it is not supported by the
     <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and Netware.
     This algorithm is <strong>insecure</strong> by today's standards.</dd>
 
     <dt><code>-s</code></dt>
-    <dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape
+    <dd>Use SHA hashing for passwords. Facilitates migration from/to Netscape
     servers using the LDAP Directory Interchange Format (ldif).
     This algorithm is <strong>insecure</strong> by today's standards.</dd>
 
@@ -215,7 +215,7 @@
     does exist, the password is changed.</dd>
 
     <dt><code><var>password</var></code></dt>
-    <dd>The plaintext password to be encrypted and stored in the DBM file.
+    <dd>The plaintext password to be hashed and stored in the DBM file.
     Used only with the <code>-b</code> flag.</dd>
 
     <dt><code>-T<var>DBTYPE</var></code></dt>
@@ -261,7 +261,7 @@
 
     <p>Adds or modifies the password for user <code>jsmith</code>. The user
     is prompted for the password. If executed on a Windows system, the password
-    will be encrypted using the  modified Apache MD5 algorithm; otherwise, the
+    will be hashed using the  modified Apache MD5 algorithm; otherwise, the
     system's <code>crypt()</code> routine will be used. If the file does not
     exist, <code>htdbm</code> will do nothing except return an error.</p>
 
@@ -288,14 +288,14 @@
     not be fetchable with a browser.</p>
 
     <p>The use of the <code>-b</code> option is discouraged, since when it is
-    used the unencrypted password appears on the command line.</p>
+    used the plaintext password appears on the command line.</p>
 
     <p>When using the <code>crypt()</code> algorithm, note that only the first
     8 characters of the password are used  to form the password. If the supplied
     password is longer, the extra characters will be silently discarded.</p>
 
-    <p>The SHA encryption format does not use salting: for a given password,
-    there is only one encrypted representation. The <code>crypt()</code> and
+    <p>The SHA hashing option does not use salting: for a given password,
+    there is only one hashed representation. The <code>crypt()</code> and
     MD5 formats permute the representation by prepending a random salt string,
     to make dictionary attacks against the passwords more difficult.</p>
 
@@ -304,13 +304,13 @@
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="restrictions" id="restrictions">Restrictions</a></h2>
-    <p>On the Windows platform, passwords encrypted with
+    <p>On the Windows platform, passwords hashed with
     <code>htdbm</code> are limited to no more than <code>255</code>
     characters in length. Longer passwords will be truncated to 255
     characters.</p>
 
     <p>The MD5 algorithm used by <code>htdbm</code> is specific to the Apache
-    software; passwords encrypted using it will not be usable with other Web
+    software; passwords hashed using it will not be usable with other Web
     servers.</p>
 
     <p>Usernames are limited to <code>255</code> bytes and may not include the
@@ -338,7 +338,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/programs/htdbm.html'
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2023 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();