grammar fix: if/when a renegotiation takeS place

author: tb <> 2020-10-08 16:02:38 +0000
committer: tb <> 2020-10-08 16:02:38 +0000
commit: a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d (patch)
tree: f1a15a4322b0c321b7edc382704ba4114bdc38fb
parent: d34cc4d51a5ecac75fd18530fd156259025d9041 (diff)
download: openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.tar.gz
openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.tar.bz2
openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.zip
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_set_mode.3 b/src/lib/libssl/man/SSL_CTX_set_mode.3
index 32bb340b65..fca1a977d0 100644
--- a/src/lib/libssl/man/SSL_CTX_set_mode.3
+++ b/src/lib/libssl/man/SSL_CTX_set_mode.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.6 2019/06/12 09:36:30 schwarze Exp $
+.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.7 2020/10/08 16:02:38 tb Exp $
 .\" full merge up to: OpenSSL 8671b898 Jun 3 02:48:34 2008 +0000
 .\" selective merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
 .\"
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2019 $
+.Dd $Mdocdate: October 8 2020 $
 .Dt SSL_CTX_SET_MODE 3
 .Os
 .Sh NAME
@@ -145,7 +145,7 @@ behaves like non-blocking
 .Xr write 2 .
 .It Dv SSL_MODE_AUTO_RETRY
 Never bother the application with retries if the transport is blocking.
-If a renegotiation take place during normal operation, a
+If a renegotiation takes place during normal operation, a
 .Xr SSL_read 3
 or
 .Xr SSL_write 3
diff --git a/src/lib/libssl/man/SSL_write.3 b/src/lib/libssl/man/SSL_write.3
index d5e985e42a..16be55f259 100644
--- a/src/lib/libssl/man/SSL_write.3
+++ b/src/lib/libssl/man/SSL_write.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_write.3,v 1.5 2018/03/27 17:35:50 schwarze Exp $
+.\"     $OpenBSD: SSL_write.3,v 1.6 2020/10/08 16:02:38 tb Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: October 8 2020 $
 .Dt SSL_WRITE 3
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ is
 .Em blocking ,
 .Fn SSL_write
 will only return once the write operation has been finished or an error
-occurred, except when a renegotiation take place, in which case a
+occurred, except when a renegotiation takes place, in which case a
 .Dv SSL_ERROR_WANT_READ
 may occur.
 This behaviour can be controlled with the
author	tb <>	2020-10-08 16:02:38 +0000
committer	tb <>	2020-10-08 16:02:38 +0000
commit	a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d (patch)
tree	f1a15a4322b0c321b7edc382704ba4114bdc38fb
parent	d34cc4d51a5ecac75fd18530fd156259025d9041 (diff)
download	openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.tar.gz openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.tar.bz2 openbsd-a9d798f1dfec60092ba09219ddb4d82a9e1f8b0d.zip

diff --git a/src/lib/libssl/man/SSL_CTX_set_mode.3 b/src/lib/libssl/man/SSL_CTX_set_mode.3 index 32bb340b65..fca1a977d0 100644 --- a/src/lib/libssl/man/SSL_CTX_set_mode.3 +++ b/src/lib/libssl/man/SSL_CTX_set_mode.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.6 2019/06/12 09:36:30 schwarze Exp $	1	.\" $OpenBSD: SSL_CTX_set_mode.3,v 1.7 2020/10/08 16:02:38 tb Exp $
2	.\" full merge up to: OpenSSL 8671b898 Jun 3 02:48:34 2008 +0000	2	.\" full merge up to: OpenSSL 8671b898 Jun 3 02:48:34 2008 +0000
3	.\" selective merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100	3	.\" selective merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
4	.\"	4	.\"
@@ -50,7 +50,7 @@
50	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	50	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
51	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	51	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
52	.\"	52	.\"
53	.Dd $Mdocdate: June 12 2019 $	53	.Dd $Mdocdate: October 8 2020 $
54	.Dt SSL_CTX_SET_MODE 3	54	.Dt SSL_CTX_SET_MODE 3
55	.Os	55	.Os
56	.Sh NAME	56	.Sh NAME
@@ -145,7 +145,7 @@ behaves like non-blocking
145	.Xr write 2 .	145	.Xr write 2 .
146	.It Dv SSL_MODE_AUTO_RETRY	146	.It Dv SSL_MODE_AUTO_RETRY
147	Never bother the application with retries if the transport is blocking.	147	Never bother the application with retries if the transport is blocking.
148	If a renegotiation take place during normal operation, a	148	If a renegotiation takes place during normal operation, a
149	.Xr SSL_read 3	149	.Xr SSL_read 3
150	or	150	or
151	.Xr SSL_write 3	151	.Xr SSL_write 3


diff --git a/src/lib/libssl/man/SSL_write.3 b/src/lib/libssl/man/SSL_write.3 index d5e985e42a..16be55f259 100644 --- a/src/lib/libssl/man/SSL_write.3 +++ b/src/lib/libssl/man/SSL_write.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: SSL_write.3,v 1.5 2018/03/27 17:35:50 schwarze Exp $	1	.\" $OpenBSD: SSL_write.3,v 1.6 2020/10/08 16:02:38 tb Exp $
2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400	2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
3	.\"	3	.\"
4	.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.	4	.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
48	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	48	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	49	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50	.\"	50	.\"
51	.Dd $Mdocdate: March 27 2018 $	51	.Dd $Mdocdate: October 8 2020 $
52	.Dt SSL_WRITE 3	52	.Dt SSL_WRITE 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -102,7 +102,7 @@ is
102	.Em blocking ,	102	.Em blocking ,
103	.Fn SSL_write	103	.Fn SSL_write
104	will only return once the write operation has been finished or an error	104	will only return once the write operation has been finished or an error
105	occurred, except when a renegotiation take place, in which case a	105	occurred, except when a renegotiation takes place, in which case a
106	.Dv SSL_ERROR_WANT_READ	106	.Dv SSL_ERROR_WANT_READ
107	may occur.	107	may occur.
108	This behaviour can be controlled with the	108	This behaviour can be controlled with the