[openssl] master update
matthias.st.pierre at ncp-e.com
matthias.st.pierre at ncp-e.com
Sun Mar 10 20:00:54 UTC 2019
The branch master has been updated
via 3dcbb6c4a395d56dfa561145d89017ff958bb18e (commit)
from dc7e354275fccc3f13d30a0024f18b5ead560532 (commit)
- Log -----------------------------------------------------------------
commit 3dcbb6c4a395d56dfa561145d89017ff958bb18e
Author: A. Schulze <git at andeasschulze.de>
Date: Sat Mar 9 19:05:31 2019 +0100
Fix two spelling errors
CLA: trivial
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8447)
-----------------------------------------------------------------------
Summary of changes:
doc/man1/s_client.pod | 2 +-
doc/man3/SSL_CTX_set_read_ahead.pod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index c4a9843..e1a71d1 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -218,7 +218,7 @@ Even though SNI should normally be a DNS name and not an IP address, if
B<-servername> is provided then that name will be sent, regardless of whether
it is a DNS name or not.
-This option cannot be used in conjuction with B<-noservername>.
+This option cannot be used in conjunction with B<-noservername>.
=item B<-noservername>
diff --git a/doc/man3/SSL_CTX_set_read_ahead.pod b/doc/man3/SSL_CTX_set_read_ahead.pod
index a71d72e..97343b9 100644
--- a/doc/man3/SSL_CTX_set_read_ahead.pod
+++ b/doc/man3/SSL_CTX_set_read_ahead.pod
@@ -46,7 +46,7 @@ records, and SSL_has_pending() can't tell the difference between processed and
unprocessed data, it's recommended that if read ahead is turned on that
B<SSL_MODE_AUTO_RETRY> is not turned off using SSL_CTX_clear_mode().
That will prevent getting B<SSL_ERROR_WANT_READ> when there is still a complete
-record availale that hasn't been processed.
+record available that hasn't been processed.
If the application wants to continue to use the underlying transport (e.g. TCP
connection) after the SSL connection is finished using SSL_shutdown() reading
More information about the openssl-commits
mailing list