From: Pauli <paul.dale@oracle.com>
Date: Tue, 21 Jul 2020 07:40:19 +0000 (+1000)
Subject: document the deprecation of the '-public-key-methods' option to list
X-Git-Tag: openssl-3.0.0-alpha6~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b9f218838ad93ab6b8dd9cd4545703839ec037a;p=thirdparty%2Fopenssl.git

document the deprecation of the '-public-key-methods' option to list

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11082)
---

diff --git a/doc/man1/openssl-list.pod.in b/doc/man1/openssl-list.pod.in
index 527e96a0841..e13b6c34cfb 100644
--- a/doc/man1/openssl-list.pod.in
+++ b/doc/man1/openssl-list.pod.in
@@ -20,11 +20,11 @@ B<openssl list>
 [B<-cipher-commands>]
 [B<-cipher-algorithms>]
 [B<-public-key-algorithms>]
-[B<-public-key-methods>]
-{- output_off() if $disabled{"deprecated-3.0"}; "" -}
+{- output_off() if $disabled{"deprecated-3.0"}; ""
+-}[B<-public-key-methods>]
 [B<-engines>]
-{- output_on() if $disabled{"deprecated-3.0"}; "" -}
-[B<-disabled>]
+{- output_on() if $disabled{"deprecated-3.0"}; ""
+-}[B<-disabled>]
 [B<-objects>]
 [B<-options> I<command>]
 {- $OpenSSL::safe::opt_provider_synopsis -}
@@ -90,11 +90,13 @@ information on what parameters each implementation supports.
 
 Display a list of public key algorithms, with each algorithm as
 a block of multiple lines, all but the first are indented.
+{- output_off() if $disabled{"deprecated-3.0"}; "" -}
 
 =item B<-public-key-methods>
 
+This option is deprecated.
+
 Display a list of public key method OIDs.
-{- output_off() if $disabled{"deprecated-3.0"}; "" -}
 
 =item B<-engines>
 
@@ -154,7 +156,8 @@ In both cases, C<bar> is the name of the provider.
 
 =head1 HISTORY
 
-The B<-engines> option was deprecated in OpenSSL 3.0.
+The B<-engines> and B<-public-key-methods> options were deprecated in
+OpenSSL 3.0.
 
 =head1 COPYRIGHT