From: Rich Bowen <rbowen@apache.org>
Date: Fri, 9 Jul 2021 12:34:42 +0000 (+0000)
Subject: s/freenode/libera/
X-Git-Tag: 2.5.0-alpha2-ci-test-only~900
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f087735b4d6e0dbefb74abe583b0ca44a9d81d37;p=thirdparty%2Fapache%2Fhttpd.git

s/freenode/libera/

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

diff --git a/.travis.yml b/.travis.yml
index 455e1d86184..5b61438e3a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -364,7 +364,7 @@ notifications:
   irc:
     if: fork = false
     channels:
-      - "chat.freenode.net#httpd-dev"
+      - "irc.libera.chat#httpd-dev"
   email:
     if: fork = false
     recipients:
diff --git a/docs/man/htdbm.1 b/docs/man/htdbm.1
index f0fb710a41c..c9187c4da4b 100644
--- a/docs/man/htdbm.1
+++ b/docs/man/htdbm.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTDBM" 1 "2020-10-09" "Apache HTTP Server" "htdbm"
+.TH "HTDBM" 1 "2021-07-09" "Apache HTTP Server" "htdbm"
 
 .SH NAME
 htdbm \- Manipulate DBM password databases
@@ -183,7 +183,7 @@ The use of the \fB-b\fR option is discouraged, since when it is used the plainte
 When using the \fBcrypt()\fR 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\&.
  
 .PP
-The SHA hashing format does not use salting: for a given password, there is only one hashed representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
+The SHA hashing option does not use salting: for a given password, there is only one hashed representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
  
 .PP
 The SHA and \fBcrypt()\fR formats are insecure by today's standards\&.
diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1
index 4e73cda0b26..1d66ebab911 100644
--- a/docs/man/htpasswd.1
+++ b/docs/man/htpasswd.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTPASSWD" 1 "2019-07-05" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2021-07-09" "Apache HTTP Server" "htpasswd"
 
 .SH NAME
 htpasswd \- Manage user files for basic authentication
@@ -161,7 +161,7 @@ The use of the \fB-b\fR option is discouraged, since when it is used the plainte
 When using the \fBcrypt()\fR 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\&.
  
 .PP
-The SHA-1 hashing option does not use salting: for a given password, there is only one hashed representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
+The SHA-1 hashing format does not use salting: for a given password, there is only one hashed representation\&. The \fBcrypt()\fR and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
  
 .PP
 The SHA-1 and \fBcrypt()\fR formats are insecure by today's standards\&.