[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  116799ff6a8fc803ec4685fc432c7329d0511e23 (commit)
      from  994fa5f9861df94c07699cb118ad5c5470a868b2 (commit)


- Log -----------------------------------------------------------------
commit 116799ff6a8fc803ec4685fc432c7329d0511e23
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 7 11:48:07 2021 +0200

    DOCS: Update the page for 'openssl passwd' to not duplicate some info
    
    The options -1 and -apr1 were mentioned in DESCRIPTION, not mentioning
    any other options or even mentioning that there are more algorithms.
    The simple fix is to remove that sentence and let the OPTIONS section
    speak for itself.
    
    Fixes #16529
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16531)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/openssl-passwd.pod.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/man1/openssl-passwd.pod.in b/doc/man1/openssl-passwd.pod.in
index ed68bab495..314fe4fe72 100644
--- a/doc/man1/openssl-passwd.pod.in
+++ b/doc/man1/openssl-passwd.pod.in
@@ -31,8 +31,6 @@ This command computes the hash of a password typed at
 run-time or the hash of each password in a list.  The password list is
 taken from the named file for option B<-in>, from stdin for
 option B<-stdin>, or from the command line, or from the terminal otherwise.
-The MD5-based BSD password algorithm B<-1>, its Apache variant B<-apr1>,
-and its AIX variant are available.
 
 =head1 OPTIONS