diff options
Diffstat (limited to 'doc/man1')
-rw-r--r-- | doc/man1/engine.pod | 4 | ||||
-rw-r--r-- | doc/man1/errstr.pod | 4 | ||||
-rw-r--r-- | doc/man1/pkcs12.pod | 3 | ||||
-rw-r--r-- | doc/man1/pkeyparam.pod | 4 | ||||
-rw-r--r-- | doc/man1/s_client.pod | 2 | ||||
-rw-r--r-- | doc/man1/s_server.pod | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/doc/man1/engine.pod b/doc/man1/engine.pod index 24f1b32cdbfc..d49f04292bfb 100644 --- a/doc/man1/engine.pod +++ b/doc/man1/engine.pod @@ -64,7 +64,7 @@ See the example below. =back -=head1 EXAMPLE +=head1 EXAMPLES To list all the commands available to a dynamic engine: @@ -109,7 +109,7 @@ 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 OpenSSL license (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/errstr.pod index 3c89b8f5cfff..94198c123ea6 100644 --- a/doc/man1/errstr.pod +++ b/doc/man1/errstr.pod @@ -20,7 +20,7 @@ second colon. None. -=head1 EXAMPLE +=head1 EXAMPLES The error code: @@ -36,7 +36,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 OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod index 6f890c120f3c..da887a469978 100644 --- a/doc/man1/pkcs12.pod +++ b/doc/man1/pkcs12.pod @@ -225,7 +225,8 @@ for this search. If the search fails it is considered a fatal error. Encrypt the certificate using triple DES, this may render the PKCS#12 file unreadable by some "export grade" software. By default the private -key is encrypted using triple DES and the certificate using 40 bit RC2. +key is encrypted using triple DES and the certificate using 40 bit RC2 +unless RC2 is disabled in which case triple DES is used. =item B<-keypbe alg>, B<-certpbe alg> diff --git a/doc/man1/pkeyparam.pod b/doc/man1/pkeyparam.pod index 50949657c818..bddabc2707e8 100644 --- a/doc/man1/pkeyparam.pod +++ b/doc/man1/pkeyparam.pod @@ -60,7 +60,7 @@ This option checks the correctness of parameters. =back -=head1 EXAMPLE +=head1 EXAMPLES Print out text version of parameters: @@ -78,7 +78,7 @@ L<dsa(1)>, L<genrsa(1)>, L<gendsa(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 OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 15752b5e1613..e2475ea0678f 100644 --- a/doc/man1/s_client.pod +++ b/doc/man1/s_client.pod @@ -147,7 +147,7 @@ SSL servers. =head1 OPTIONS In addition to the options below the B<s_client> utility also supports the -common and client only options documented in the +common and client only options documented in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)> manual page. diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod index 768789633e7f..7fa382a8ae33 100644 --- a/doc/man1/s_server.pod +++ b/doc/man1/s_server.pod @@ -193,7 +193,7 @@ for connections on a given port using SSL/TLS. =head1 OPTIONS In addition to the options below the B<s_server> utility also supports the -common and server only options documented in the +common and server only options documented in the "Supported Command Line Commands" section of the L<SSL_CONF_cmd(3)> manual page. |