In documentation, consistently refer to OpenSSL 3.0

3.0.0 is a habit from pre-3.0 OpenSSL, which doesn't make sense with
the new version scheme.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9376)

diff --git a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
index db2ad36b40c327eef0d194a4b1d276b1e52e36e6..b36084dc463571feeae459e1591dffc6cce55a90 100644 (file)
--- a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
+++ b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod
@@ -108,7 +108,7 @@ ossl_sa_TYPE_free_leaves() do not return values.
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/internal/man3/OSSL_METHOD_STORE.pod b/doc/internal/man3/OSSL_METHOD_STORE.pod
index f95d397cf34144c78e683e344ad8bd122c199b00..abe7ebe31763ea90e1d7deae235f823dd832678e 100644 (file)
--- a/doc/internal/man3/OSSL_METHOD_STORE.pod
+++ b/doc/internal/man3/OSSL_METHOD_STORE.pod
@@ -103,7 +103,7 @@ ossl_method_store_free() and ossl_method_store_cleanup() do not return values.
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man1/verify.pod b/doc/man1/verify.pod
index 10fd848622ec3d56c533a1ee9ea9661efaae1c07..e0c6906e2410ffde454a2e1530e1c3d4ca096236 100644 (file)
--- a/doc/man1/verify.pod
+++ b/doc/man1/verify.pod
@@ -779,7 +779,7 @@ The B<-show_chain> option was added in OpenSSL 1.1.0.
 The B<-issuer_checks> option is deprecated as of OpenSSL 1.1.0 and
 is silently ignored.
 
-The B<-sm2-id> and B<-sm2-hex-id> options were added in OpenSSL 3.0.0.
+The B<-sm2-id> and B<-sm2-hex-id> options were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod
index 9076be817171228b035c789fc5ace85d53d1a737..9c3fd713dc04c906a49823a132d0a1ff9ca7b85b 100644 (file)
--- a/doc/man3/ASYNC_WAIT_CTX_new.pod
+++ b/doc/man3/ASYNC_WAIT_CTX_new.pod
@@ -195,7 +195,7 @@ were added in OpenSSL 1.1.0.
 
 ASYNC_WAIT_CTX_set_callback(), ASYNC_WAIT_CTX_get_callback(),
 ASYNC_WAIT_CTX_set_status(), and ASYNC_WAIT_CTX_get_status()
-were added in OpenSSL 3.0.0.
+were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod
index f51593fb6e2c7b49f987490b302234e5179cec2e..c8e33863755efa129c1c2302afe7f31a7d796f73 100644 (file)
--- a/doc/man3/BIO_ctrl.pod
+++ b/doc/man3/BIO_ctrl.pod
@@ -141,7 +141,7 @@ the case of BIO_seek() on a file BIO for a successful operation.
 =head1 HISTORY
 
 The BIO_get_ktls_send() and BIO_get_ktls_recv() functions were added in
-OpenSSL 3.0.0.
+OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod
index f37d532b98de984fb09150b688a9c32413e163ca..b0321b0933d8e7cb2118865959ad818dfb23df28 100644 (file)
--- a/doc/man3/CRYPTO_get_ex_new_index.pod
+++ b/doc/man3/CRYPTO_get_ex_new_index.pod
@@ -162,7 +162,7 @@ dup_func() should return 0 for failure and 1 for success.
 
 =head1 HISTORY
 
-CRYPTO_alloc_ex_data() was added in OpenSSL 3.0.0.
+CRYPTO_alloc_ex_data() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/EVP_KDF_CTX.pod b/doc/man3/EVP_KDF_CTX.pod
index 3899361065bcc05e5fd2f92fdfed231309f3b2a6..e65becf462e2e075b690f7681ef41bd4a0fe2f7d 100644 (file)
--- a/doc/man3/EVP_KDF_CTX.pod
+++ b/doc/man3/EVP_KDF_CTX.pod
@@ -282,7 +282,7 @@ L<EVP_KDF_X942KDF(7)>
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod
index 01ad6ed52277419ad3dbb03280411e2c255b51bc..2c6687945c6d1e61dd4f230c6b6ba18e341cd94d 100644 (file)
--- a/doc/man3/EVP_MAC.pod
+++ b/doc/man3/EVP_MAC.pod
@@ -358,7 +358,7 @@ L<EVP_MAC_POLY1305(7)>
 
 =head1 HISTORY
 
-These functions were added in OpenSSL 3.0.0.
+These functions were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/EVP_PKEY_supports_digest_nid.pod b/doc/man3/EVP_PKEY_supports_digest_nid.pod
index 0dfc1163b4d62d3bf1be7cd801d260209f66c043..b3f51346caae221032362379dfbd256b2c7b1596 100644 (file)
--- a/doc/man3/EVP_PKEY_supports_digest_nid.pod
+++ b/doc/man3/EVP_PKEY_supports_digest_nid.pod
@@ -39,7 +39,7 @@ L<EVP_PKEY_verify_recover(3)>,
 
 =head1 HISTORY
 
-The EVP_PKEY_supports_digest_nid() function was added in OpenSSL 3.0.0.
+The EVP_PKEY_supports_digest_nid() function was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OPENSSL_CTX.pod b/doc/man3/OPENSSL_CTX.pod
index 1893c923a30fb1fecbd4c7101cf47f09b966f21c..d574a374d6a43785d2a871f82c4706c9d791f86d 100644 (file)
--- a/doc/man3/OPENSSL_CTX.pod
+++ b/doc/man3/OPENSSL_CTX.pod
@@ -38,7 +38,7 @@ OPENSSL_CTX_free() doesn't return any value.
 =head1 HISTORY
 
 OPENSSL_CTX, OPENSSL_CTX_new() and OPENSSL_CTX_free()
-were added in OpenSSL 3.0.0.
+were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OSSL_PARAM_int.pod b/doc/man3/OSSL_PARAM_int.pod
index 3aa6141f0c226293bdf97cea30e955a74fed4b43..0640bcf0ca188ce072ec4a98f6e7b74f175872f1 100644 (file)
--- a/doc/man3/OSSL_PARAM_int.pod
+++ b/doc/man3/OSSL_PARAM_int.pod
@@ -312,7 +312,7 @@ L<openssl-core.h(7)>, L<OSSL_PARAM(3)>
 
 =head1 HISTORY
 
-These APIs were introduced in OpenSSL 3.0.0.
+These APIs were introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OSSL_trace_enabled.pod b/doc/man3/OSSL_trace_enabled.pod
index 958e8b063b0127cd5db70103402fb64c0a9d2cc8..2ced3d412fbd4c3040b7c8d332dc61fe91529e4b 100644 (file)
--- a/doc/man3/OSSL_trace_enabled.pod
+++ b/doc/man3/OSSL_trace_enabled.pod
@@ -278,7 +278,7 @@ otherwise C<NULL>.
 
 =head1 HISTORY
 
-The OpenSSL Tracing API was added ino OpenSSL 3.0.0.
+The OpenSSL Tracing API was added ino OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OSSL_trace_get_category_num.pod b/doc/man3/OSSL_trace_get_category_num.pod
index 886d0f155c6e6b12c6455818a073463d4dad5820..5ab05a3a5cdfa887df794c224741eb8eac7bf677 100644 (file)
--- a/doc/man3/OSSL_trace_get_category_num.pod
+++ b/doc/man3/OSSL_trace_get_category_num.pod
@@ -30,7 +30,7 @@ C<num> is a recognised category number, otherwise NULL.
 
 =head1 HISTORY
 
-The OpenSSL Tracing API was added ino OpenSSL 3.0.0.
+The OpenSSL Tracing API was added ino OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod
index cb349674c45b1c04db93eba8baec54af6245b1ee..9c03218a21795846d5b7d6193e1fbc8aeb584493 100644 (file)
--- a/doc/man3/OSSL_trace_set_channel.pod
+++ b/doc/man3/OSSL_trace_set_channel.pod
@@ -297,7 +297,7 @@ functions described here are inoperational, i.e. will do nothing.
 
 OSSL_trace_set_channel(), OSSL_trace_set_prefix(),
 OSSL_trace_set_suffix(), and OSSL_trace_set_callback() were all added
-in OpenSSL 3.0.0.
+in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/OpenSSL_version.pod b/doc/man3/OpenSSL_version.pod
index c1ced6434d3779d7ee0ad61c1f2054b9de5d6483..9b8ecd2d2cd80d879b62ea297ad1af471132b2fa 100644 (file)
--- a/doc/man3/OpenSSL_version.pod
+++ b/doc/man3/OpenSSL_version.pod
@@ -219,7 +219,7 @@ L<crypto(7)>
 
 =head1 HISTORY
 
-The macros and functions described here were added in OpenSSL 3.0.0,
+The macros and functions described here were added in OpenSSL 3.0,
 with the exception of the L</BACKWARD COMPATIBILITY> ones.
 
 =head1 COPYRIGHT

diff --git a/doc/man3/RAND_DRBG_generate.pod b/doc/man3/RAND_DRBG_generate.pod
index e0778ea22462d66613c1656b8c4306aba03be234..def98a9680a73b18887808d7a84fd94b4d44d5db 100644 (file)
--- a/doc/man3/RAND_DRBG_generate.pod
+++ b/doc/man3/RAND_DRBG_generate.pod
@@ -76,7 +76,7 @@ L<RAND_DRBG(7)>
 
 The RAND_DRBG functions were added in OpenSSL 1.1.1.
 
-Prediction resistance is supported from OpenSSL 3.0.0.
+Prediction resistance is supported from OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/RAND_DRBG_reseed.pod b/doc/man3/RAND_DRBG_reseed.pod
index 40375603f770a40922383045e2644486a83da19b..b73f35fb66f73f457f39bdd6e1e3371364b6b3e8 100644 (file)
--- a/doc/man3/RAND_DRBG_reseed.pod
+++ b/doc/man3/RAND_DRBG_reseed.pod
@@ -104,7 +104,7 @@ L<RAND_DRBG(7)>
 
 The RAND_DRBG functions were added in OpenSSL 1.1.1.
 
-Prediction resistance is supported from OpenSSL 3.0.0.
+Prediction resistance is supported from OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SRP_VBASE_new.pod b/doc/man3/SRP_VBASE_new.pod
index d780cf24cc2edf0bed41bb225bf580bc10500255..0a7b117c0d15ca9062c5d4d3a1f2a4700ed7ee59 100644 (file)
--- a/doc/man3/SRP_VBASE_new.pod
+++ b/doc/man3/SRP_VBASE_new.pod
@@ -83,7 +83,7 @@ L<SSL_CTX_set_srp_password(3)>
 
 =head1 HISTORY
 
-The SRP_VBASE_add0_user() function was added in OpenSSL 3.0.0.
+The SRP_VBASE_add0_user() function was added in OpenSSL 3.0.
 
 All other functions were added in OpenSSL 1.0.1.
 

diff --git a/doc/man3/SRP_user_pwd_new.pod b/doc/man3/SRP_user_pwd_new.pod
index b1799d173b5612070492b990d517150d57f955d8..9d9e11d98eecede195891d2e917e1747eb4bc8a8 100644 (file)
--- a/doc/man3/SRP_user_pwd_new.pod
+++ b/doc/man3/SRP_user_pwd_new.pod
@@ -56,7 +56,7 @@ L<SSL_CTX_set_srp_password(3)>
 
 =head1 HISTORY
 
-These functions were made public in OpenSSL 3.0.0.
+These functions were made public in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SSL_CTX_set_cipher_list.pod b/doc/man3/SSL_CTX_set_cipher_list.pod
index 1852405421931fd16caaaf3a263d82085eb49ee9..c602ac0df75c45b128f46112d29e7e42432ea7fb 100644 (file)
--- a/doc/man3/SSL_CTX_set_cipher_list.pod
+++ b/doc/man3/SSL_CTX_set_cipher_list.pod
@@ -96,7 +96,7 @@ and the handshake will fail.
 
 OSSL_default_cipher_list() and OSSL_default_ciphersuites() replace
 SSL_DEFAULT_CIPHER_LIST and TLS_DEFAULT_CIPHERSUITES, respectively. The
-cipher list defines are deprecated as of 3.0.0.
+cipher list defines are deprecated as of 3.0.
 
 =head1 RETURN VALUES
 
@@ -115,7 +115,7 @@ L<ciphers(1)>
 
 =head1 HISTORY
 
-OSSL_default_cipher_list() and OSSL_default_ciphersites() are new in 3.0.0.
+OSSL_default_cipher_list() and OSSL_default_ciphersites() are new in 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SSL_CTX_set_mode.pod b/doc/man3/SSL_CTX_set_mode.pod
index a4997c96227781d15e6f1a6d94efaa71fe7152ed..f1f6c7a5c88a2a424120b3ad197a4e33e72cc584 100644 (file)
--- a/doc/man3/SSL_CTX_set_mode.pod
+++ b/doc/man3/SSL_CTX_set_mode.pod
@@ -150,7 +150,7 @@ L<SSL_write(3)>, L<SSL_get_error(3)>
 =head1 HISTORY
 
 SSL_MODE_ASYNC was added in OpenSSL 1.1.0.
-SSL_MODE_NO_KTLS_TX was added in OpenSSL 3.0.0.
+SSL_MODE_NO_KTLS_TX was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index 7626bd338b6363b22272165c1fe837d2fda60b24..32abd2fc014c4d613e86770051dff127278f5716 100644 (file)
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -374,7 +374,7 @@ OpenSSL 0.9.8m.
 The B<SSL_OP_PRIORITIZE_CHACHA> and B<SSL_OP_NO_RENEGOTIATION> options
 were added in OpenSSL 1.1.1.
 
-The B<SSL_OP_NO_EXTENDED_MASTER_SECRET> option was added in OpenSSL 3.0.0.
+The B<SSL_OP_NO_EXTENDED_MASTER_SECRET> option was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SSL_set_async_callback.pod b/doc/man3/SSL_set_async_callback.pod
index 5e7f61eaf1102b15dc9f55f798e9df3e4d9abf10..24cf02c12017864525901ea3d1f3091e80885ef3 100644 (file)
--- a/doc/man3/SSL_set_async_callback.pod
+++ b/doc/man3/SSL_set_async_callback.pod
@@ -82,7 +82,7 @@ SSL_get_async_status() return 1 on success or 0 on error.
 
 SSL_CTX_set_async_callback(), SSL_CTX_set_async_callback_arg(),
 SSL_set_async_callback(), SSL_set_async_callback_arg() and
-SSL_get_async_status() were first added to OpenSSL 3.0.0.
+SSL_get_async_status() were first added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man3/SSL_write.pod b/doc/man3/SSL_write.pod
index a1ceb202500c5e571efa885bb25208e24244d9c0..04cc46b27a5c3b7ec5f0bb8e1262de867d87f0f5 100644 (file)
--- a/doc/man3/SSL_write.pod
+++ b/doc/man3/SSL_write.pod
@@ -141,7 +141,7 @@ L<ssl(7)>, L<bio(7)>
 =head1 HISTORY
 
 The SSL_write_ex() function was added in OpenSSL 1.1.1.
-The SSL_sendfile() function was added in OpenSSL 3.0.0.
+The SSL_sendfile() function was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/EVP_KDF_PBKDF2.pod b/doc/man7/EVP_KDF_PBKDF2.pod
index c3d3f275f8102a0e76fac9f96978812498a64f56..e914f3713cca2a9bace1b00375c12c08e9db0c2a 100644 (file)
--- a/doc/man7/EVP_KDF_PBKDF2.pod
+++ b/doc/man7/EVP_KDF_PBKDF2.pod
@@ -93,7 +93,7 @@ L<EVP_KDF_CTX(3)/CONTROLS>
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/EVP_KDF_SS.pod b/doc/man7/EVP_KDF_SS.pod
index b3de26a4644b8e89bbbf00619d4178f5e7e6896f..958089d24aef42460b9d5eb5f15f159324404f9f 100644 (file)
--- a/doc/man7/EVP_KDF_SS.pod
+++ b/doc/man7/EVP_KDF_SS.pod
@@ -211,7 +211,7 @@ L<EVP_KDF_CTX(3)/CONTROLS>
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/EVP_KDF_X942.pod b/doc/man7/EVP_KDF_X942.pod
index 306ab2e48e28ebdca3d701a6240373c287d513ce..df93e861f958b009401620567210f5555bb35b9e 100644 (file)
--- a/doc/man7/EVP_KDF_X942.pod
+++ b/doc/man7/EVP_KDF_X942.pod
@@ -136,7 +136,7 @@ L<EVP_KDF_CTX(3)/CONTROLS>
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/EVP_KDF_X963.pod b/doc/man7/EVP_KDF_X963.pod
index eaea6da23c67ccf3335c32f669baf96bacbe7012..77b878f6bafde00c6b63b4152533876f59324029 100644 (file)
--- a/doc/man7/EVP_KDF_X963.pod
+++ b/doc/man7/EVP_KDF_X963.pod
@@ -122,7 +122,7 @@ L<EVP_KDF_CTX(3)/CONTROLS>
 
 =head1 HISTORY
 
-This functionality was added to OpenSSL 3.0.0.
+This functionality was added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/EVP_MAC_BLAKE2.pod b/doc/man7/EVP_MAC_BLAKE2.pod
index 58b4f993738be64224942099c00d7054fb6aef3c..2fc8051475608530c3e976d1eaf4fbe7d8b6641e 100644 (file)
--- a/doc/man7/EVP_MAC_BLAKE2.pod
+++ b/doc/man7/EVP_MAC_BLAKE2.pod
@@ -100,7 +100,7 @@ L<EVP_MAC_ctrl(3)>, L<EVP_MAC(3)/CONTROLS>
 
 =head1 HISTORY
 
-The macros and functions described here were added to OpenSSL 3.0.0.
+The macros and functions described here were added to OpenSSL 3.0.
 
 =head1 COPYRIGHT
 

diff --git a/doc/man7/openssl_user_macros.pod.in b/doc/man7/openssl_user_macros.pod.in
index 17c2d2e1bb24b95f6a2bc8ea101433e1bcc07fb1..7a2387c37bfd0a1b9a1c5927b477bec2004ec184 100644 (file)
--- a/doc/man7/openssl_user_macros.pod.in
+++ b/doc/man7/openssl_user_macros.pod.in
@@ -60,7 +60,7 @@ However, it is recommended to start using the second form instead:
 =item C<m>
 
 This form is a simple number that represents the major version number
-and is supported for version 3.0.0 and up.  For extra convenience,
+and is supported for version 3.0 and up.  For extra convenience,
 these numbers are also available:
 
 =over 4