Deprecate unprefixed manual entries for openssl commands

Initially, the manual page entry for the 'openssl cmd' command used
to be available at 'cmd(1)'. Later, the aliases 'openssl-cmd(1)' was
introduced, which made it easier to group the openssl commands using
the 'apropos(1)' command or the shell's tab completion.

In order to reduce cluttering of the global manual page namespace,
the manual page entries without the 'openssl-' prefix have been
deprecated in OpenSSL 3.0 and will be removed in OpenSSL 4.0.

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

54 files changed, 442 insertions, 208 deletions

diff --git a/doc/man1/CA.pl.pod b/doc/man1/CA.pl.pod
index 8c8b3785d0..b055622bff 100644
--- a/doc/man1/CA.pl.pod
+++ b/doc/man1/CA.pl.pod
@@ -199,7 +199,11 @@ behaviour of the certificate commands call the B<openssl> command directly.
 
 =head1 SEE ALSO
 
-L<x509(1)>, L<ca(1)>, L<req(1)>, L<pkcs12(1)>,
+L<openssl(1)>,
+L<openssl-x509(1)>,
+L<openssl-ca(1)>,
+L<openssl-req(1)>,
+L<openssl-pkcs12(1)>,
 L<config(5)>
 
 =head1 COPYRIGHT
diff --git a/doc/man1/asn1parse.pod b/doc/man1/openssl-asn1parse.pod
index ec6e633407..ccb2f034b1 100644
--- a/doc/man1/asn1parse.pod
+++ b/doc/man1/openssl-asn1parse.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-asn1parse,
-asn1parse - ASN.1 parsing tool
+openssl-asn1parse - ASN.1 parsing tool
 
 =head1 SYNOPSIS
 
@@ -201,11 +200,12 @@ ASN.1 types is not well handled (if at all).
 
 =head1 SEE ALSO
 
+L<openssl(1)>,
 L<ASN1_generate_nconf(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/ca.pod b/doc/man1/openssl-ca.pod
index 8438d1dccb..9826fbfc9d 100644
--- a/doc/man1/ca.pod
+++ b/doc/man1/openssl-ca.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-ca,
-ca - sample minimal CA application
+openssl-ca - sample minimal CA application
 
 =head1 SYNOPSIS
 
@@ -770,8 +769,13 @@ are in year 2050 or later.
 
 =head1 SEE ALSO
 
-L<req(1)>, L<spkac(1)>, L<x509(1)>, L<CA.pl(1)>,
-L<config(5)>, L<x509v3_config(5)>
+L<openssl(1)>,
+L<openssl-req(1)>,
+L<openssl-spkac(1)>,
+L<openssl-x509(1)>,
+L<CA.pl(1)>,
+L<config(5)>,
+L<x509v3_config(5)>
 
 =head1 COPYRIGHT
 
diff --git a/doc/man1/ciphers.pod b/doc/man1/openssl-ciphers.pod
index e29c5d7ced..eabf312262 100644
--- a/doc/man1/ciphers.pod
+++ b/doc/man1/openssl-ciphers.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-ciphers,
-ciphers - SSL cipher display and cipher list tool
+openssl-ciphers - SSL cipher display and cipher list tool
 
 =head1 SYNOPSIS
 
@@ -753,7 +752,10 @@ Set security level to 2 and display all ciphers consistent with level 2:
 
 =head1 SEE ALSO
 
-L<s_client(1)>, L<s_server(1)>, L<ssl(7)>
+L<openssl(1)>,
+L<openssl-s_client(1)>,
+L<openssl-s_server(1)>,
+L<ssl(7)>
 
 =head1 HISTORY
 
@@ -766,7 +768,7 @@ The B<-convert> option was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/openssl-cmds.pod b/doc/man1/openssl-cmds.pod
new file mode 100644
index 0000000000..cab89f126d
--- /dev/null
+++ b/doc/man1/openssl-cmds.pod
@@ -0,0 +1,153 @@
+=pod
+
+=head1 NAME
+
+asn1parse,
+ca,
+ciphers,
+cms,
+crl,
+crl2pkcs7,
+dgst,
+dhparam,
+dsa,
+dsaparam,
+ec,
+ecparam,
+enc,
+engine,
+errstr,
+gendsa,
+genpkey,
+genrsa,
+info,
+kdf,
+mac,
+nseq,
+ocsp,
+passwd,
+pkcs12,
+pkcs7,
+pkcs8,
+pkey,
+pkeyparam,
+pkeyutl,
+prime,
+rand,
+rehash,
+req,
+rsa,
+rsautl,
+s_client,
+s_server,
+s_time,
+sess_id,
+smime,
+speed,
+spkac,
+srp,
+storeutl,
+ts,
+verify,
+version,
+x509
+- OpenSSL application commands
+
+=head1 SYNOPSIS
+
+=for comment generic
+
+B<openssl> B<cmd> [B<-help>] [B<...>]
+
+=head1 DESCRIPTION
+
+Every B<cmd> listed above is a (sub-)command of the L<openssl(1)> application.
+It has its own detailed manual page at B<openssl-cmd(1)>. For example, to view
+the manual page for the B<openssl dgst> command, type B<man openssl-dgst>.
+
+=head1 OPTIONS
+
+Among others, every subcommand has a help option.
+
+=over 4
+
+=item B<-help>
+
+Print out a usage message for the subcommand.
+
+=back
+
+=head1 SEE ALSO
+
+L<openssl(1)>,
+L<openssl-asn1parse(1)>,
+L<openssl-ca(1)>,
+L<openssl-ciphers(1)>,
+L<openssl-cms(1)>,
+L<openssl-crl(1)>,
+L<openssl-crl2pkcs7(1)>,
+L<openssl-dgst(1)>,
+L<openssl-dhparam(1)>,
+L<openssl-dsa(1)>,
+L<openssl-dsaparam(1)>,
+L<openssl-ec(1)>,
+L<openssl-ecparam(1)>,
+L<openssl-enc(1)>,
+L<openssl-engine(1)>,
+L<openssl-errstr(1)>,
+L<openssl-gendsa(1)>,
+L<openssl-genpkey(1)>,
+L<openssl-genrsa(1)>,
+L<openssl-info(1)>,
+L<openssl-kdf(1)>,
+L<openssl-mac(1)>,
+L<openssl-nseq(1)>,
+L<openssl-ocsp(1)>,
+L<openssl-passwd(1)>,
+L<openssl-pkcs12(1)>,
+L<openssl-pkcs7(1)>,
+L<openssl-pkcs8(1)>,
+L<openssl-pkey(1)>,
+L<openssl-pkeyparam(1)>,
+L<openssl-pkeyutl(1)>,
+L<openssl-prime(1)>,
+L<openssl-rand(1)>,
+L<openssl-rehash(1)>,
+L<openssl-req(1)>,
+L<openssl-rsa(1)>,
+L<openssl-rsautl(1)>,
+L<openssl-s_client(1)>,
+L<openssl-s_server(1)>,
+L<openssl-s_time(1)>,
+L<openssl-sess_id(1)>,
+L<openssl-smime(1)>,
+L<openssl-speed(1)>,
+L<openssl-spkac(1)>,
+L<openssl-srp(1)>,
+L<openssl-storeutl(1)>,
+L<openssl-ts(1)>,
+L<openssl-verify(1)>,
+L<openssl-version(1)>,
+L<openssl-x509(1)>,
+
+=head1 HISTORY
+
+Initially, the manual page entry for the B<openssl cmd> command used
+to be available at B<cmd(1)>. Later, the alias B<openssl-cmd(1)> was
+introduced, which made it easier to group the openssl commands using
+the L<apropos(1)> command or the shell's tab completion.
+
+In order to reduce cluttering of the global manual page namespace,
+the manual page entries without the 'openssl-' prefix have been
+deprecated in OpenSSL 3.0 and will be removed in OpenSSL 4.0.
+
+=head1 COPYRIGHT
+
+Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the Apache License 2.0 (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man1/cms.pod b/doc/man1/openssl-cms.pod
index b2031c6a7a..b0e3a29d09 100644
--- a/doc/man1/cms.pod
+++ b/doc/man1/openssl-cms.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-cms,
-cms - CMS utility
+openssl-cms - CMS utility
 
 =head1 SYNOPSIS
 
@@ -776,7 +775,7 @@ The -no_alt_chains option was added in OpenSSL 1.0.2b.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/crl.pod b/doc/man1/openssl-crl.pod
index a76f2ae095..35fe5ed1fc 100644
--- a/doc/man1/crl.pod
+++ b/doc/man1/openssl-crl.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-crl,
-crl - CRL utility
+openssl-crl - CRL utility
 
 =head1 SYNOPSIS
 
@@ -129,11 +128,14 @@ and files too.
 
 =head1 SEE ALSO
 
-L<crl2pkcs7(1)>, L<ca(1)>, L<x509(1)>
+L<openssl(1)>,
+L<openssl-crl2pkcs7(1)>,
+L<openssl-ca(1)>,
+L<openssl-x509(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/crl2pkcs7.pod b/doc/man1/openssl-crl2pkcs7.pod
index df58b8a2c7..bb172529be 100644
--- a/doc/man1/crl2pkcs7.pod
+++ b/doc/man1/openssl-crl2pkcs7.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-crl2pkcs7,
-crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates
+openssl-crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates
 
 =head1 SYNOPSIS
 
@@ -92,11 +91,12 @@ install user certificates and CAs in MSIE using the Xenroll control.
 
 =head1 SEE ALSO
 
-L<pkcs7(1)>
+L<openssl(1)>,
+L<openssl-pkcs7(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/dgst.pod b/doc/man1/openssl-dgst.pod
index 0116a792c3..ed1a088e6e 100644
--- a/doc/man1/dgst.pod
+++ b/doc/man1/openssl-dgst.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-dgst,
-dgst - perform digest operations
+openssl-dgst - perform digest operations
 
 =head1 SYNOPSIS
 
diff --git a/doc/man1/dhparam.pod b/doc/man1/openssl-dhparam.pod
index c51bbaa63e..6643e20e2a 100644
--- a/doc/man1/dhparam.pod
+++ b/doc/man1/openssl-dhparam.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-dhparam,
-dhparam - DH parameter manipulation and generation
+openssl-dhparam - DH parameter manipulation and generation
 
 =head1 SYNOPSIS
 
@@ -154,7 +153,8 @@ There should be a way to generate and manipulate DH keys.
 
 =head1 SEE ALSO
 
-L<dsaparam(1)>
+L<openssl(1)>,
+L<openssl-dsaparam(1)>
 
 =head1 COPYRIGHT
 
diff --git a/doc/man1/dsa.pod b/doc/man1/openssl-dsa.pod
index 3358131d01..8039b395c3 100644
--- a/doc/man1/dsa.pod
+++ b/doc/man1/openssl-dsa.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-dsa,
-dsa - DSA key processing
+openssl-dsa - DSA key processing
 
 =head1 SYNOPSIS
 
@@ -167,12 +166,15 @@ To just output the public part of a private key:
 
 =head1 SEE ALSO
 
-L<dsaparam(1)>, L<gendsa(1)>, L<rsa(1)>,
-L<genrsa(1)>
+L<openssl(1)>,
+L<openssl-dsaparam(1)>,
+L<openssl-gendsa(1)>,
+L<openssl-rsa(1)>,
+L<openssl-genrsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/dsaparam.pod b/doc/man1/openssl-dsaparam.pod
index 795c52d5c5..e6a63cf96e 100644
--- a/doc/man1/dsaparam.pod
+++ b/doc/man1/openssl-dsaparam.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-dsaparam,
-dsaparam - DSA parameter manipulation and generation
+openssl-dsaparam - DSA parameter manipulation and generation
 
 =head1 SYNOPSIS
 
@@ -121,12 +120,15 @@ DSA parameters is often used to generate several distinct keys.
 
 =head1 SEE ALSO
 
-L<gendsa(1)>, L<dsa(1)>, L<genrsa(1)>,
-L<rsa(1)>
+L<openssl(1)>,
+L<openssl-gendsa(1)>,
+L<openssl-dsa(1)>,
+L<openssl-genrsa(1)>,
+L<openssl-rsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/ec.pod b/doc/man1/openssl-ec.pod
index 0a1e7af7e1..6d86c1a10a 100644
--- a/doc/man1/ec.pod
+++ b/doc/man1/openssl-ec.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-ec,
-ec - EC key processing
+openssl-ec - EC key processing
 
 =head1 SYNOPSIS
 
@@ -189,11 +188,14 @@ To change the point conversion form to B<compressed>:
 
 =head1 SEE ALSO
 
-L<ecparam(1)>, L<dsa(1)>, L<rsa(1)>
+L<openssl(1)>,
+L<openssl-ecparam(1)>,
+L<openssl-dsa(1)>,
+L<openssl-rsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2003-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/ecparam.pod b/doc/man1/openssl-ecparam.pod
index fac930ea41..9d8539bd22 100644
--- a/doc/man1/ecparam.pod
+++ b/doc/man1/openssl-ecparam.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-ecparam,
-ecparam - EC parameter manipulation and generation
+openssl-ecparam - EC parameter manipulation and generation
 
 =head1 SYNOPSIS
 
@@ -184,11 +183,13 @@ To print out the EC parameters to standard output:
 
 =head1 SEE ALSO
 
-L<ec(1)>, L<dsaparam(1)>
+L<openssl(1)>,
+L<openssl-ec(1)>,
+L<openssl-dsaparam(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2003-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2003-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/enc.pod b/doc/man1/openssl-enc.pod
index 7a6ce5a275..2ea69e77b0 100644
--- a/doc/man1/enc.pod
+++ b/doc/man1/openssl-enc.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-enc,
-enc - symmetric cipher routines
+openssl-enc - symmetric cipher routines
 
 =head1 SYNOPSIS
 
@@ -421,7 +420,7 @@ The default digest was changed from MD5 to SHA256 in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/engine.pod b/doc/man1/openssl-engine.pod
index e0f881ae9c..976d69c2b6 100644
--- a/doc/man1/engine.pod
+++ b/doc/man1/openssl-engine.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-engine,
-engine - load and query engines
+openssl-engine - load and query engines
 
 =head1 SYNOPSIS
 
@@ -105,11 +104,12 @@ The path to the engines directory.
 
 =head1 SEE ALSO
 
+L<openssl(1)>,
 L<config(5)>
 
 =head1 COPYRIGHT
 
-Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/errstr.pod b/doc/man1/openssl-errstr.pod
index 9ba20914a9..c910f84f09 100644
--- a/doc/man1/errstr.pod
+++ b/doc/man1/openssl-errstr.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-errstr,
-errstr - lookup error codes
+openssl-errstr - lookup error codes
 
 =head1 SYNOPSIS
 
@@ -36,7 +35,7 @@ to produce the error message:
 
 =head1 COPYRIGHT
 
-Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/gendsa.pod b/doc/man1/openssl-gendsa.pod
index 180ce57f93..36da9983cd 100644
--- a/doc/man1/gendsa.pod
+++ b/doc/man1/openssl-gendsa.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-gendsa,
-gendsa - generate a DSA private key from a set of parameters
+openssl-gendsa - generate a DSA private key from a set of parameters
 
 =head1 SYNOPSIS
 
@@ -91,12 +90,15 @@ much quicker that RSA key generation for example.
 
 =head1 SEE ALSO
 
-L<dsaparam(1)>, L<dsa(1)>, L<genrsa(1)>,
-L<rsa(1)>
+L<openssl(1)>,
+L<openssl-dsaparam(1)>,
+L<openssl-dsa(1)>,
+L<openssl-genrsa(1)>,
+L<openssl-rsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/genpkey.pod b/doc/man1/openssl-genpkey.pod
index e418c13f8d..c9364109b3 100644
--- a/doc/man1/genpkey.pod
+++ b/doc/man1/openssl-genpkey.pod
@@ -2,8 +2,7 @@
 
 =head1 NAME
 
-openssl-genpkey,
-genpkey - generate a private key
+openssl-genpkey - generate a private key
 
 =head1 SYNOPSIS
 
@@ -325,7 +324,7 @@ The ability to generate X448, ED25519 and ED448 keys was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/genrsa.pod b/doc/man1/openssl-genrsa.pod
index f8cbb17e8c.