summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-02-26 15:27:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-02-26 15:29:49 +0000
commit1510b1f4c22ea80b22f6a383f15b11ce3eb0539b (patch)
tree48c499c221a19bbf34e27d683c788414abdf2f3b
parentf8a69166ed1d26bf1e08ab573d021cecdb05cba5 (diff)
Update SSL_CONF docs.
Fix some typos and update version number first added: it has now been backported to OpenSSL 1.0.2. (cherry picked from commit 4365e4aad97fa37e4a97eb2270a64c03e6547014)
-rw-r--r--doc/ssl/SSL_CONF_CTX_new.pod2
-rw-r--r--doc/ssl/SSL_CONF_CTX_set1_prefix.pod2
-rw-r--r--doc/ssl/SSL_CONF_CTX_set_flags.pod2
-rw-r--r--doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod2
-rw-r--r--doc/ssl/SSL_CONF_cmd.pod4
-rw-r--r--doc/ssl/SSL_CONF_cmd_argv.pod4
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/ssl/SSL_CONF_CTX_new.pod b/doc/ssl/SSL_CONF_CTX_new.pod
index 1ae4ac627e..a9ccb049f4 100644
--- a/doc/ssl/SSL_CONF_CTX_new.pod
+++ b/doc/ssl/SSL_CONF_CTX_new.pod
@@ -35,6 +35,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
=head1 HISTORY
-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2
=cut
diff --git a/doc/ssl/SSL_CONF_CTX_set1_prefix.pod b/doc/ssl/SSL_CONF_CTX_set1_prefix.pod
index 3b165db89b..76990188d1 100644
--- a/doc/ssl/SSL_CONF_CTX_set1_prefix.pod
+++ b/doc/ssl/SSL_CONF_CTX_set1_prefix.pod
@@ -44,6 +44,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
=head1 HISTORY
-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2
=cut
diff --git a/doc/ssl/SSL_CONF_CTX_set_flags.pod b/doc/ssl/SSL_CONF_CTX_set_flags.pod
index 90d97e74f0..cc3d20e7ec 100644
--- a/doc/ssl/SSL_CONF_CTX_set_flags.pod
+++ b/doc/ssl/SSL_CONF_CTX_set_flags.pod
@@ -59,6 +59,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
=head1 HISTORY
-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2
=cut
diff --git a/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod b/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
index cfb7cb2599..4fc8f06d9e 100644
--- a/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
+++ b/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
@@ -42,6 +42,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
=head1 HISTORY
-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2
=cut
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/ssl/SSL_CONF_cmd.pod
index 0fbf0d75df..5952072f9e 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/ssl/SSL_CONF_cmd.pod
@@ -312,7 +312,7 @@ Set automatic support for any elliptic curve for key exchange:
=head1 RETURN VALUES
-SSL_CONF_cmd() return 1 if the value of B<cmd> is recognised and B<value> is
+SSL_CONF_cmd() returns 1 if the value of B<cmd> is recognised and B<value> is
B<NOT> used and 2 if both B<cmd> and B<value> are used. In other words it
returns the number of arguments processed. This is useful when processing
command lines.
@@ -337,6 +337,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
=head1 HISTORY
-SSL_CONF_cmd() was first added to OpenSSL 1.1.0
+SSL_CONF_cmd() was first added to OpenSSL 1.0.2
=cut
diff --git a/doc/ssl/SSL_CONF_cmd_argv.pod b/doc/ssl/SSL_CONF_cmd_argv.pod
index 8d495ba5cb..246eaa5bd3 100644
--- a/doc/ssl/SSL_CONF_cmd_argv.pod
+++ b/doc/ssl/SSL_CONF_cmd_argv.pod
@@ -20,7 +20,7 @@ argument can be set to B<NULL> is it is not used.
=head1 RETURN VALUES
SSL_CONF_cmd_argv() returns the number of command arguments processed: 0, 1, 2
-2 or a negative error code.
+or a negative error code.
If -2 is returned then an argument for a command is missing.
@@ -37,6 +37,6 @@ L<SSL_CONF_cmd(3)|SSL_CONF_cmd(3)>
=head1 HISTORY
-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2
=cut