man pages: add missing commas between subordinate and main clauses

jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.

ok jmc@

90 files changed, 330 insertions, 330 deletions

diff --git a/lib/libagentx/agentx.3 b/lib/libagentx/agentx.3
index e587eb7dd80..d45a3ae885a 100644
--- a/lib/libagentx/agentx.3
+++ b/lib/libagentx/agentx.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: agentx.3,v 1.7 2021/03/12 05:18:00 jsg Exp $
+.\" $OpenBSD: agentx.3,v 1.8 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 2020 Martijn van Duren <martijn@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 12 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt AGENTX 3
 .Os
 .Sh NAME
@@ -326,7 +326,7 @@ is created by
 .Fn agentx
 or when
 .Fa sa
-detects that there is no connection to the agentx master it calls out to
+detects that there is no connection to the agentx master, it calls out to
 .Fa nofd
 with itself,
 .Fa cookie
@@ -335,7 +335,7 @@ and an integer
 as arguments.
 If
 .Fa close
-is not set
+is not set,
 .Fn nofd
 is expected to set up a new
 .Fa fd
@@ -352,18 +352,18 @@ but must always be done as a result of a call to
 .Fn nofd .
 Once
 .Fn agentx_connect
-has been called the application is responsible for retrieving data when available
+has been called, the application is responsible for retrieving data when available
 on
 .Fa fd
 by calling
 .Fn agentx_read .
-If nonblocking writes are desirable the
+If nonblocking writes are desirable, the
 .Fn agentx_wantwrite
 pointer can be set to an application function and will be called as soon as
 there's data available to be written out.
 Once
 .Fa fd
-is ready for write the function
+is ready for a write, the function
 .Fn agentx_write
 should be called.
 .Pp
@@ -371,8 +371,8 @@ should be called.
 can be freed via
 .Fn agentx_free .
 It will close all active sessions and free all derived objects.
-Once freed no new objects can be derived from the freed objects.
-Once all sessions are closed it will call out to
+Once freed, no new objects can be derived from the freed objects.
+Once all sessions are closed, it will call out to
 .Fn nofd
 with
 .Fa close
@@ -390,7 +390,7 @@ The
 .Fa timeout
 argument specifies the maximum time in seconds the master should wait for a
 reply before determining we're gone.
-If set to 0 the agentx master determines the timeout.
+If set to 0, the agentx master determines the timeout.
 The
 .Fa oid
 and
@@ -407,7 +407,7 @@ The
 is the SNMPv3 context in which the objects operate and is built on top of
 agentx_session
 .Fa sas .
-If the default context is requested
+If the default context is requested,
 .Fa name
 must be NULL.
 .Pp
@@ -420,13 +420,13 @@ combination should point to an AGENT-CAPABILITIES object which describes the
 capabilities of the subagent.
 .Fa descr
 should be a textual description of the capabilities.
-If no AGENT-CAPABILITIES object is defined this function can be omitted.
+If no AGENT-CAPABILITIES object is defined, this function can be omitted.
 .Pp
 A
 .Vt agentx_region
 indicates a region inside the object-tree for which get- and set-requests will
 be queried.
-If the OID has already been claimed by another subagent it will try to claim it
+If the OID has already been claimed by another subagent, it will try to claim it
 on a lower priority.
 The
 .Fa timeout
@@ -450,7 +450,7 @@ registers the first available index;
 and
 .Fn agentx_index_integer_value
 tries to register a specific value.
-If the registration of an index fails an error will be logged and all objects
+If the registration of an index fails, an error will be logged and all objects
 using it will remain disabled.
 The OID where the index should be registered is documented by the MIB.
 These registered indices are usually used for tables where multiple subagents
@@ -483,7 +483,7 @@ and indexlen can't be more than
 .Dv AGENTX_OID_INDEX_MAX_LEN .
 If
 .Fa implied
-is set the final index must be of type OID or string and will omit the leading
+is set, the final index must be of type OID or string and will omit the leading
 length indicator.
 This value must only be set if specified in the MIB.
 .Fn getcb
@@ -529,8 +529,8 @@ Set the return value to an opaque value.
 .It Fn agentx_varbind_counter64
 Set the return value to an uint64_t of type counter64.
 .It Fn agentx_varbind_notfound
-When the request is of type GET return a nosuchinstance error.
-When the request is of type GETNEXT or GETBULK return an endofmibview error.
+When the request is of type GET, return a nosuchinstance error.
+When the request is of type GETNEXT or GETBULK, return an endofmibview error.
 On endofmibview the next object is queried.
 This function can only be called on objects that contain one or more *_dynamic
 indices.
@@ -612,7 +612,7 @@ is set the object must be reachable from the agentx master, else NULL is
 returned.
 If
 .Fa inclusive
-is set the object returned may also exactly match
+is set, the object returned may also exactly match
 .Fa oid .
 .It Fn agentx_context_uptime
 Returns the sysuptime in seconds for
diff --git a/lib/libc/asr/asr_run.3 b/lib/libc/asr/asr_run.3
index f9dba304cc1..d9b3282f3b7 100644
--- a/lib/libc/asr/asr_run.3
+++ b/lib/libc/asr/asr_run.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: asr_run.3,v 1.4 2019/10/24 05:57:41 otto Exp $
+.\"	$OpenBSD: asr_run.3,v 1.5 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 2012-2014, Eric Faurot <eric@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 24 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt ASR_RUN 3
 .Os
 .Sh NAME
@@ -240,7 +240,7 @@ structure contains the address of the DNS server that sent the response,
 contains the code returned by the server in the DNS response packet, and
 .Fa ar_count
 contains the number of answers in the packet.
-If a response is received it is placed in a newly allocated buffer
+If a response is received, it is placed in a newly allocated buffer
 and returned as
 .Fa ar_data
 member.
diff --git a/lib/libc/compat-43/sigvec.3 b/lib/libc/compat-43/sigvec.3
index 1d44d78a725..5ad8e0a0d5d 100644
--- a/lib/libc/compat-43/sigvec.3
+++ b/lib/libc/compat-43/sigvec.3
@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigvec.3,v 1.35 2017/05/29 11:10:29 jmc Exp $
+.\"	$OpenBSD: sigvec.3,v 1.36 2022/03/31 17:27:15 naddy Exp $
 .\"
-.Dd $Mdocdate: May 29 2017 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SIGVEC 3
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@ from before the signal's delivery.
 If the process wishes to resume in a different context, then it
 must arrange to restore the previous context itself.
 .Pp
-When a signal is delivered to a process a new signal mask is
+When a signal is delivered to a process, a new signal mask is
 installed for the duration of the process' signal handler
 (or until a
 .Xr sigblock 3
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index aab03d87514..e49f3000596 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: btree.3,v 1.24 2019/04/23 18:13:11 schwarze Exp $
+.\"	$OpenBSD: btree.3,v 1.25 2022/03/31 17:27:15 naddy Exp $
 .\"	$NetBSD: btree.3,v 1.6 1996/05/03 21:26:48 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: April 23 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BTREE 3
 .Os
 .Sh NAME
@@ -118,7 +118,7 @@ Obviously, using a cache increases (but only increases) the likelihood of
 corruption or lost data if the system crashes while a tree is being modified.
 If
 .Fa cachesize
-is 0 (no size is specified) a default cache is used.
+is 0 (no size is specified), a default cache is used.
 .It Fa maxkeypage
 The maximum number of keys which will be stored on any single page.
 Not currently implemented.
@@ -130,13 +130,13 @@ by the minkeypage value, it will be stored on overflow pages instead
 of in the page itself.
 If
 .Fa minkeypage
-is 0 (no minimum number of keys is specified) a value of 2 is used.
+is 0 (no minimum number of keys is specified), a value of 2 is used.
 .It Fa psize
 Page size is the size (in bytes) of the pages used for nodes in the tree.
 The minimum page size is 512 bytes and the maximum page size is 64K.
 If
 .Fa psize
-is 0 (no page size is specified) a page size is chosen based on the
+is 0 (no page size is specified), a page size is chosen based on the
 underlying file system I/O block size.
 .It Fa compare
 Compare is the key comparison function.
@@ -178,7 +178,7 @@ The number should represent the order as an integer; for example,
 big endian order would be the number 4,321.
 If
 .Fa lorder
-is 0 (no order is specified) the current host order is used.
+is 0 (no order is specified), the current host order is used.
 .El
 .Pp
 If the file already exists (and the
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index ae162925653..c4246a67903 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hash.3,v 1.20 2016/05/09 11:13:10 naddy Exp $
+.\"	$OpenBSD: hash.3,v 1.21 2022/03/31 17:27:15 naddy Exp $
 .\"	$NetBSD: hash.3,v 1.6 1996/05/03 21:26:50 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: May 9 2016 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt HASH 3
 .Os
 .Sh NAME
@@ -110,7 +110,7 @@ The number should represent the order as an integer; for example,
 big endian order would be the number 4,321.
 If
 .Fa lorder
-is 0 (no order is specified) the current host order is used.
+is 0 (no order is specified), the current host order is used.
 If the file already exists, the specified value is ignored and the
 value specified when the tree was created is used.
 .El
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 2a58f6fc920..ba7e656ab9d 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recno.3,v 1.20 2015/09/10 10:20:55 jmc Exp $
+.\"	$OpenBSD: recno.3,v 1.21 2022/03/31 17:27:15 naddy Exp $
 .\"	$NetBSD: recno.3,v 1.6 1996/05/03 21:26:51 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt RECNO 3
 .Os
 .Sh NAME
@@ -118,14 +118,14 @@ This value is
 advisory, and the access method will allocate more memory rather than fail.
 If
 .Fa cachesize
-is 0 (no size is specified) a default cache is used.
+is 0 (no size is specified), a default cache is used.
 .It Fa psize
 The recno access method stores the in-memory copies of its records
 in a btree.
 This value is the size (in bytes) of the pages used for nodes in that tree.
 If
 .Fa psize
-is 0 (no page size is specified) a page size is chosen based on the
+is 0 (no page size is specified), a page size is chosen based on the
 underlying file system I/O block size.
 See
 .Xr btree 3
@@ -136,7 +136,7 @@ The number should represent the order as an integer; for example,
 big endian order would be the number 4,321.
 If
 .Fa lorder
-is 0 (no order is specified) the current host order is used.
+is 0 (no order is specified), the current host order is used.
 .It Fa reclen
 The length of a fixed-length record.
 .It Fa bval
diff --git a/lib/libc/gen/auth_subr.3 b/lib/libc/gen/auth_subr.3
index a9834f03e26..c7bd965f944 100644
--- a/lib/libc/gen/auth_subr.3
+++ b/lib/libc/gen/auth_subr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: auth_subr.3,v 1.25 2021/05/31 19:54:04 millert Exp $
+.\"	$OpenBSD: auth_subr.3,v 1.26 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: auth_subr.3,v 2.5 2000/03/30 19:11:27 polk Exp $
-.Dd $Mdocdate: May 31 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt AUTH_OPEN 3
 .Os
 .Sh NAME
@@ -388,7 +388,7 @@ passed to the login scripts for their possible use.
 .It Dv AUTH_INTERACTIVE
 If set to any value, then the session is tagged as interactive.
 If not set, the session is not interactive.
-When the value is requested it is always either
+When the value is requested, it is always either
 .Dv NULL
 or
 .Dq True .
@@ -421,7 +421,7 @@ These variables are set by login scripts.
 When a new login script is run
 (by the
 .Fn auth_call
-function)
+function),
 the values from the previous login script are lost.
 (See
 .Xr login.conf 5
@@ -519,7 +519,7 @@ If no entry has been saved (either explicitly via
 or implicitly via
 .Fn auth_check_expire
 or
-.Fn auth_check_change )
+.Fn auth_check_change ) ,
 it returns
 .Dv NULL .
 Note that the memory containing the password file entry is freed by
diff --git a/lib/libc/gen/authenticate.3 b/lib/libc/gen/authenticate.3
index c83b190540c..e8b8a68be6f 100644
--- a/lib/libc/gen/authenticate.3
+++ b/lib/libc/gen/authenticate.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: authenticate.3,v 1.18 2016/03/30 06:58:06 jmc Exp $
+.\"	$OpenBSD: authenticate.3,v 1.19 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: authenticate.3,v 2.7 1998/09/03 20:27:20 prb Exp $
-.Dd $Mdocdate: March 30 2016 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt AUTH_APPROVAL 3
 .Os
 .Sh NAME
@@ -249,7 +249,7 @@ If the class does not have the field
 .Dq ignorenologin
 and the file
 .Pa /etc/nologin
-exists its contents will be copied to standard output and
+exists, its contents will be copied to standard output and
 .Xr exit 3
 will be called with a value of 1.
 .Pp
diff --git a/lib/libc/gen/cgetent.3 b/lib/libc/gen/cgetent.3
index 76cb4c889f5..4932746f5fa 100644
--- a/lib/libc/gen/cgetent.3
+++ b/lib/libc/gen/cgetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgetent.3,v 1.2 2021/02/02 07:33:29 jmc Exp $
+.\"	$OpenBSD: cgetent.3,v 1.3 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 2 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt CGETENT 3
 .Os
 .Sh NAME
@@ -456,7 +456,7 @@ Numeric capability values may be given in one of three numeric bases.
 If the number starts with either
 .Ql 0x
 or
-.Ql 0X
+.Ql 0X ,
 it is interpreted as a hexadecimal number (both upper and lower case a-f
 may be used to denote the extended hexadecimal digits).
 Otherwise, if the number starts with a
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 727b4b0345c..d6114de1c99 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdomainname.3,v 1.26 2018/01/12 04:36:44 deraadt Exp $
+.\"	$OpenBSD: getdomainname.3,v 1.27 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 12 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETDOMAINNAME 3
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ which has length
 This call is restricted to the superuser and
 is normally used only when the system is bootstrapped.
 .Sh RETURN VALUES
-If the call succeeds a value of 0 is returned.
+If the call succeeds, a value of 0 is returned.
 If the call fails, a value of \-1 is returned and an error code is
 placed in the global variable
 .Va errno .
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 9c267f10bfd..1f30f15fc57 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostname.3,v 1.28 2018/01/12 04:36:44 deraadt Exp $
+.\"	$OpenBSD: gethostname.3,v 1.29 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 12 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETHOSTNAME 3
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ which has length
 This call is restricted to the superuser and
 is normally used only when the system is bootstrapped.
 .Sh RETURN VALUES
-If the call succeeds a value of 0 is returned.
+If the call succeeds, a value of 0 is returned.
 If the call fails, a value of \-1 is returned and an error code is
 placed in the global variable
 .Va errno .
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index ac6bec387da..e51e7b62899 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sleep.3,v 1.17 2021/12/07 03:16:08 cheloha Exp $
+.\"	$OpenBSD: sleep.3,v 1.18 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 7 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SLEEP 3
 .Os
 .Sh NAME
@@ -59,7 +59,7 @@ for the interrupting signal.
 If
 .Fn sleep
 sleeps for the full count of
-.Fa seconds
+.Fa seconds ,
 it returns 0.
 Otherwise,
 .Fn sleep
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index a6d48715dc9..da1382a8982 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslog.3,v 1.36 2020/02/05 12:35:19 schwarze Exp $
+.\"	$OpenBSD: syslog.3,v 1.37 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 5 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SYSLOG 3
 .Os
 .Sh NAME
@@ -233,7 +233,7 @@ one or more of the following values:
 If
 .Fn syslog
 cannot pass the message to
-.Xr syslogd 8
+.Xr syslogd 8 ,
 it will attempt to write the message to the console
 .Pq Pa /dev/console .
 .It Dv LOG_NDELAY
diff --git a/lib/libc/hash/MD5Init.3 b/lib/libc/hash/MD5Init.3
index 3cfca64c3b9..fa8d9fadf91 100644
--- a/lib/libc/hash/MD5Init.3
+++ b/lib/libc/hash/MD5Init.3
@@ -16,9 +16,9 @@
 .\" If we meet some day, and you think this stuff is worth it, you
 .\" can buy me a beer in return. Poul-Henning Kamp
 .\"
-.\" 	$OpenBSD: MD5Init.3,v 1.2 2019/12/05 21:45:05 jmc Exp $
+.\" 	$OpenBSD: MD5Init.3,v 1.3 2022/03/31 17:27:15 naddy Exp $
 .\"
-.Dd $Mdocdate: December 5 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt MD5INIT 3
 .Os
 .Sh NAME
@@ -157,7 +157,7 @@ and subsequently must be explicitly deallocated using
 after use.
 If the
 .Ar buf
-argument is non-null it must point to at least MD5_DIGEST_STRING_LENGTH
+argument is non-null, it must point to at least MD5_DIGEST_STRING_LENGTH
 characters of buffer space.
 .Sh SEE ALSO
 .Xr cksum 1 ,
diff --git a/lib/libc/hash/RMD160Init.3 b/lib/libc/hash/RMD160Init.3
index e6349e1d3c9..c3afa488ca7 100644
--- a/lib/libc/hash/RMD160Init.3
+++ b/lib/libc/hash/RMD160Init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RMD160Init.3,v 1.2 2019/12/05 21:45:05 jmc Exp $
+.\"	$OpenBSD: RMD160Init.3,v 1.3 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <millert@openbsd.org>
 .\"
@@ -17,7 +17,7 @@
 .\" See http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
 .\"	for detailed information about RIPEMD-160.
 .\"
-.Dd $Mdocdate: December 5 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt RMD160INIT 3
 .Os
 .Sh NAME
@@ -125,7 +125,7 @@ function calculates the digest for a file and returns the result via
 .Fn RMD160End .
 If
 .Fn RMD160File
-is unable to open the file a NULL pointer is returned.
+is unable to open the file, a NULL pointer is returned.
 .Pp
 .Fn RMD160FileChunk
 behaves like
diff --git a/lib/libc/hash/SHA1Init.3 b/lib/libc/hash/SHA1Init.3
index 723ccfb4e01..f604e6c1e7e 100644
--- a/lib/libc/hash/SHA1Init.3
+++ b/lib/libc/hash/SHA1Init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: SHA1Init.3,v 1.2 2019/12/05 21:45:05 jmc Exp $
+.\"	$OpenBSD: SHA1Init.3,v 1.3 2022/03/31 17:27:15 naddy Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <millert@openbsd.org>
 .\"
@@ -17,7 +17,7 @@
 .\" See http://csrc.nist.gov/publications/fips/fips180-1/fip180-1.txt
 .\" for the detailed standard
 .\"
-.Dd $Mdocdate: December 5 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SHA1INIT 3
 .Os
 .Sh NAME
@@ -126,7 +126,7 @@ function calculates the digest for a file and returns the result via
 .Fn SHA1End .
 If
 .Fn SHA1File
-is unable to open the file a
+is unable to open the file, a
 .Dv NULL
 pointer is returned.
 .Pp
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index de46e70182b..035db2780b5 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getaddrinfo.3,v 1.59 2019/08/30 20:20:50 jmc Exp $
+.\"	$OpenBSD: getaddrinfo.3,v 1.60 2022/03/31 17:27:16 naddy Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 30 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -105,7 +105,7 @@ or
 .Dv SOCK_RAW .
 When
 .Fa ai_socktype
-is zero the caller will accept any socket type.
+is zero, the caller will accept any socket type.
 .It Fa ai_protocol
 Indicates which transport protocol is desired,
 .Dv IPPROTO_UDP
@@ -113,7 +113,7 @@ or
 .Dv IPPROTO_TCP .
 If
 .Fa ai_protocol
-is zero the caller will accept any protocol.
+is zero, the caller will accept any protocol.
 .It Fa ai_flags
 .Fa ai_flags
 is formed by
@@ -180,7 +180,7 @@ and no service name resolution should be attempted.
 .It Dv AI_PASSIVE
 If the
 .Dv AI_PASSIVE
-bit is set it indicates that the returned socket address structure
+bit is set, it indicates that the returned socket address structure
 is intended for use in a call to
 .Xr bind 2 .
 In this case, if the
diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3
index fb4253aa2c7..41ba842166b 100644
--- a/lib/libc/net/inet6_opt_init.3
+++ b/lib/libc/net/inet6_opt_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_opt_init.3,v 1.7 2022/03/29 18:15:52 naddy Exp $
+.\"	$OpenBSD: inet6_opt_init.3,v 1.8 2022/03/31 17:27:16 naddy Exp $
 .\"	$KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 29 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt INET6_OPT_INIT 3
 .Os
 .\"
@@ -97,7 +97,7 @@ The
 function can perform different jobs.
 When a valid
 .Fa extbuf
-argument is supplied it appends an option to the extension buffer and
+argument is supplied, it appends an option to the extension buffer and
 returns the updated total length as well as a pointer to the newly
 created option in
 .Fa databufp .
@@ -173,7 +173,7 @@ or
 When
 .Fa extbuf
 is not
-.Dv NULL
+.Dv NULL ,
 the function also sets up the appropriate padding bytes by inserting a
 Pad1 or PadN option of the proper length.
 .Pp
@@ -238,7 +238,7 @@ and
 point to the 8-bit option type, the 8-bit option length and the option
 data respectively.
 This function does not return any PAD1 or PADN options.
-When an error occurs or there are no more options the return
+When an error occurs or there are no more options, the return
 value is \-1.
 .\"
 .Ss inet6_opt_find
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
index fd69da24556..c40b45057e3 100644
--- a/lib/libc/net/inet6_rth_space.3
+++ b/lib/libc/net/inet6_rth_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_rth_space.3,v 1.7 2014/06/11 16:59:47 chrisz Exp $
+.\"	$OpenBSD: inet6_rth_space.3,v 1.8 2022/03/31 17:27:16 naddy Exp $
 .\"	$KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 11 2014 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt INET6_RTH_SPACE 3
 .Os
 .\"
@@ -85,7 +85,7 @@ argument and containing the number of addresses specified in the
 .Fa segments
 argument.
 When the type is
-.Dv IPV6_RTHDR_TYPE_0
+.Dv IPV6_RTHDR_TYPE_0 ,
 the number of segments must be from 0 through 127.
 The return value from this function is the number of bytes required to
 store the routing header.
diff --git a/lib/libc/net/inet_net_ntop.3 b/lib/libc/net/inet_net_ntop.3
index 816e87bf986..cac234be42c 100644
--- a/lib/libc/net/inet_net_ntop.3
+++ b/lib/libc/net/inet_net_ntop.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet_net_ntop.3,v 1.2 2021/09/01 15:59:22 claudio Exp $
+.\"	$OpenBSD: inet_net_ntop.3,v 1.3 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: inet_net.3,v 1.1 1997/06/18 02:25:27 lukem Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 1 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt INET_NET_NTOP 3
 .Os
 .Sh NAME
@@ -110,7 +110,7 @@ is in the range
 and is used to explicitly specify the number of bits in the network address.
 When
 .Dq Li /bits
-is not specified the number of bits in the network address is calculated
+is not specified, the number of bits in the network address is calculated
 as the larger of the number of bits in the class to which the address
 belongs and the number of bits provided rounded up modulo 8.
 Examples:
@@ -176,7 +176,7 @@ is in the range
 and is used to explicitly specify the number of bits in the network address.
 When
 .Dq Li /bits
-is not specified 128 is used.
+is not specified, 128 is used.
 Note that when the number of bits is specified using
 .Dq Li /bits
 notation, the value of the address still includes all bits supplied
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index decc165d32c..572e95dc4f7 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.3,v 1.54 2014/10/26 12:54:18 millert Exp $
+.\"	$OpenBSD: mktemp.3,v 1.55 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 26 2014 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt MKTEMP 3
 .Os
 .Sh NAME
@@ -83,7 +83,7 @@ function generates a temporary file name based on a template as
 described above.
 Because
 .Fn mktemp
-does not actually create the temporary file there is a window of
+does not actually create the temporary file, there is a window of
 opportunity during which another process can open the file instead.
 Because of this race condition,
 .Fn mktemp
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index 59730e3feb9..5383f904925 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scanf.3,v 1.25 2019/08/30 20:27:25 jmc Exp $
+.\"	$OpenBSD: scanf.3,v 1.26 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 30 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SCANF 3
 .Os
 .Sh NAME
@@ -164,7 +164,7 @@ or that the conversion will be one of
 .Cm sc[ .
 .Pp
 If the conversion is one of
-.Cm sc[
+.Cm sc[ ,
 the expected conversion input is a multibyte character sequence.
 Each multibyte character in the sequence is converted with a call to the
 .Fn mbrtowc
diff --git a/lib/libc/stdio/wprintf.3 b/lib/libc/stdio/wprintf.3
index 96c99f6aa23..05ed0842640 100644
--- a/lib/libc/stdio/wprintf.3
+++ b/lib/libc/stdio/wprintf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wprintf.3,v 1.9 2021/09/02 09:50:38 deraadt Exp $
+.\"	$OpenBSD: wprintf.3,v 1.10 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 2 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt WPRINTF 3
 .Os
 .Sh NAME
@@ -151,7 +151,7 @@ argument accessed will be used.
 Arguments are numbered starting at
 .Cm 1 .
 If unaccessed arguments in the format string are interspersed with ones that
-are accessed the results will be indeterminate.
+are accessed, the results will be indeterminate.
 .It
 Zero or more of the following flags:
 .Bl -tag -width "'0' (space)"
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index dc3e691ece2..9bd498ab50d 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -30,9 +30,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: malloc.3,v 1.128 2021/04/09 06:04:15 otto Exp $
+.\"	$OpenBSD: malloc.3,v 1.129 2022/03/31 17:27:16 naddy Exp $
 .\"
-.Dd $Mdocdate: April 9 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -423,7 +423,7 @@ and multiplying
 .Fa oldnmemb
 and
 .Fa size
-results in integer overflow
+results in integer overflow,
 .Fn recallocarray
 returns
 .Dv NULL
@@ -610,7 +610,7 @@ Here is a brief description of the error messages and what they mean:
 .It Dq out of memory
 If the
 .Cm X
-option is specified it is an error for the allocation functions
+option is specified, it is an error for the allocation functions
 to return
 .Dv NULL .
 .It Dq bogus pointer (double free?)
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index cd904356148..a7ab9850130 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tsearch.3,v 1.21 2019/01/25 00:19:25 millert Exp $
+.\" $OpenBSD: tsearch.3,v 1.22 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <millert@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 25 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt TSEARCH 3
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ except that if no match is found,
 is inserted into the tree and a pointer to it is returned.
 If
 .Fa rootp
-points to a null value a new binary search tree is created.
+points to a null value, a new binary search tree is created.
 .Pp
 .Fn tdelete
 deletes a node from the specified binary search tree and returns
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index c3bab1ec7dd..a6b5635fab4 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bind.2,v 1.22 2021/01/03 18:10:27 rob Exp $
+.\"	$OpenBSD: bind.2,v 1.23 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: bind.2,v 1.8 1995/10/12 15:40:46 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 3 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BIND 2
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Fn bind
 assigns a name to an unnamed socket.
 When a socket is created with
-.Xr socket 2
+.Xr socket 2 ,
 it exists in a name space (address family) but has no name assigned.
 .Fn bind
 requests that
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index 53ad392601f..d9378c8543c 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chroot.2,v 1.23 2021/01/03 18:10:27 rob Exp $
+.\"	$OpenBSD: chroot.2,v 1.24 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: chroot.2,v 1.7 1995/02/27 12:32:12 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 3 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt CHROOT 2
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@ to become the root directory, that is, the starting point for path
 searches of pathnames beginning with
 .Ql / .
 .Pp
-In order for a directory to become the root directory
+In order for a directory to become the root directory,
 a process must have execute (search) access for that directory.
 .Pp
 If the program is not currently running with an altered root directory,
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 796bfd0512d..0ba8a68581d 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: clock_gettime.2,v 1.31 2020/10/25 00:54:51 cheloha Exp $
+.\"	$OpenBSD: clock_gettime.2,v 1.32 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 25 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt CLOCK_GETTIME 2
 .Os
 .Sh NAME
@@ -105,7 +105,7 @@ Only the
 clock may be set and only the superuser may set it.
 If the system
 .Xr securelevel 7
-is 2 or greater the time may only be advanced.
+is 2 or greater, the time may only be advanced.
 This limitation is imposed to prevent a malicious superuser
 from setting arbitrary timestamps on files.
 .Pp
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index f4e57c3afc5..0aaa5c7691c 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: execve.2,v 1.55 2021/06/30 18:46:49 schwarze Exp $
+.\"	$OpenBSD: execve.2,v 1.56 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: execve.2,v 1.9 1995/02/27 12:32:25 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)execve.2	8.3 (Berkeley) 1/24/94
 .\"
-.Dd $Mdocdate: June 30 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EXECVE 2
 .Os
 .Sh NAME
@@ -65,7 +65,7 @@ An interpreter file begins with a line of the form:
 .Ed
 .Pp
 When an interpreter file is passed to
-.Fn execve
+.Fn execve ,
 the system instead calls
 .Fn execve
 with the specified
@@ -225,11 +225,11 @@ to the arguments themselves.
 As the
 .Fn execve
 function overlays the current process image
-with a new process image the successful call
+with a new process image, the successful call
 has no process to return to.
 If
 .Fn execve
-does return to the calling process an error has occurred; the
+does return to the calling process, an error has occurred; the
 return value will be \-1 and the global variable
 .Va errno
 is set to indicate the error.
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index 21b24ed2a0c..67b9aa48e85 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getsockname.2,v 1.30 2015/09/10 17:55:21 schwarze Exp $
+.\"	$OpenBSD: getsockname.2,v 1.31 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: getsockname.2,v 1.6 1995/10/12 15:41:00 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETSOCKNAME 2
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@ Common uses of this function are as follows:
 When
 .Xr bind 2
 is called with a port number of 0 (indicating the kernel should pick
-an ephemeral port)
+an ephemeral port),
 .Fn getsockname
 is used to retrieve the kernel-assigned port number.
 .It
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 07369b1aa1c..8ed6136dbff 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getsockopt.2,v 1.58 2021/10/08 14:12:58 jmc Exp $
+.\"	$OpenBSD: getsockopt.2,v 1.59 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: getsockopt.2,v 1.7 1995/02/27 12:33:29 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)getsockopt.2	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: October 8 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETSOCKOPT 2
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@ they are always present at the uppermost
 .Dq socket
 level.
 .Pp
-When manipulating socket options the level at which the
+When manipulating socket options, the level at which the
 option resides and the name of the option must be specified.
 To manipulate options at the socket level,
 .Fa level
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 33e6d27547d..24a4ca49920 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettimeofday.2,v 1.32 2021/12/06 02:48:55 cheloha Exp $
+.\"	$OpenBSD: gettimeofday.2,v 1.33 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
 .\"
-.Dd $Mdocdate: December 6 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt GETTIMEOFDAY 2
 .Os
 .Sh NAME
@@ -81,7 +81,7 @@ is
 Only the superuser may set the clock.
 If the system
 .Xr securelevel 7
-is 2 or greater the clock may only be advanced.
+is 2 or greater, the clock may only be advanced.
 This limitation prevents a malicious superuser
 from setting arbitrary timestamps on files.
 Setting the clock cancels any ongoing
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 7d69a2d420f..f358d13afed 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kqueue.2,v 1.45 2021/11/21 23:44:55 jan Exp $
+.\"	$OpenBSD: kqueue.2,v 1.46 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 2000 Jonathan Lemon
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.18 2001/02/14 08:48:35 guido Exp $
 .\"
-.Dd $Mdocdate: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -206,7 +206,7 @@ Causes
 to return with
 .Dv EV_ERROR
 set without draining any pending events after updating events in the kqueue.
-When a filter is successfully added the
+When a filter is successfully added, the
 .Fa data
 field will be zero.
 This flag is useful for making bulk changes to a kqueue.
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 69b05e7e185..2fb45c15316 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mmap.2,v 1.67 2021/06/30 18:46:49 schwarze Exp $
+.\"	$OpenBSD: mmap.2,v 1.68 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: mmap.2,v 1.5 1995/06/24 10:48:59 cgd Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)mmap.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: June 30 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -66,7 +66,7 @@ failing that it will be placed "close by".
 If
 .Fa addr
 is
-.Dv NULL
+.Dv NULL ,
 the system can pick any address.
 Except for
 .Dv MAP_FIXED
diff --git a/lib/libc/sys/mquery.2 b/lib/libc/sys/mquery.2
index ba87270f8c0..7da8cda279e 100644
--- a/lib/libc/sys/mquery.2
+++ b/lib/libc/sys/mquery.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mquery.2,v 1.12 2021/01/20 19:44:48 otto Exp $
+.\"	$OpenBSD: mquery.2,v 1.13 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 2003 Artur Grabowski <art@openbsd.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 20 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt MQUERY 2
 .Os
 .Sh NAME
@@ -63,7 +63,7 @@ The behavior of the function depends on the
 .Fa flags
 argument.
 If set to
-.Dv MAP_FIXED
+.Dv MAP_FIXED ,
 the pointer
 .Fa addr
 is used as a fixed hint and
@@ -78,7 +78,7 @@ if there is not
 .Fa size
 bytes free after that address.
 Otherwise it will return the hint addr.
-If no flags are set
+If no flags are set,
 .Fn mquery
 will use
 .Fa addr
@@ -91,7 +91,7 @@ file and offset specified in the
 and
 .Fa off
 arguments.
-When no such area can be found
+When no such area can be found,
 .Fn mquery
 will return
 .Dv MAP_FAILED
@@ -99,7 +99,7 @@ and set
 .Va errno
 to indicate the error.
 .Sh RETURN VALUES
-When a memory range satisfying the request is found
+When a memory range satisfying the request is found,
 .Fn mquery
 returns the available address.
 Otherwise,
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index 53cdabd2048..50e273b2888 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nanosleep.2,v 1.18 2021/07/25 15:47:26 cheloha Exp $
+.\"	$OpenBSD: nanosleep.2,v 1.19 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: nanosleep.2,v 1.1 1997/04/17 18:12:02 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: July 25 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt NANOSLEEP 2
 .Os
 .Sh NAME
@@ -56,7 +56,7 @@ If
 .Fn nanosleep
 sleeps the full
 .Fa timeout
-without interruption it returns 0.
+without interruption, it returns 0.
 Unless
 .Fa remainder
 is
@@ -65,7 +65,7 @@ it is set to zero.
 .Pp
 If
 .Fn nanosleep
-is interrupted by a signal it returns \-1 and the global variable
+is interrupted by a signal, it returns \-1 and the global variable
 .Va errno
 is set to
 .Dv EINTR .
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index a7fa1ba24e3..c8e056bbd92 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: open.2,v 1.50 2021/01/03 18:10:27 rob Exp $
+.\"	$OpenBSD: open.2,v 1.51 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: open.2,v 1.8 1995/02/27 12:35:14 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
 .\"
-.Dd $Mdocdate: January 3 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OPEN 2
 .Os
 .Sh NAME
@@ -183,7 +183,7 @@ If
 is successful, the file pointer used to mark the current position within
 the file is set to the beginning of the file.
 .Pp
-When a new file is created it is given the group of the directory
+When a new file is created, it is given the group of the directory
 which contains it.
 .Pp
 The new descriptor is set to remain open across
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 55c4448382e..39f9baa0d11 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ptrace.2,v 1.41 2021/11/21 23:44:55 jan Exp $
+.\"	$OpenBSD: ptrace.2,v 1.42 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: ptrace.2,v 1.3 1996/02/23 01:39:41 jtc Exp $
 .\"
 .\" This file is in the public domain.
-.Dd $Mdocdate: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PTRACE 2
 .Os
 .Sh NAME
@@ -231,7 +231,7 @@ On return the
 .Fa piod_len
 field in the descriptor will be updated with the actual number of bytes
 transferred.
-If the requested I/O couldn't be successfully performed
+If the requested I/O could not be successfully performed,
 .Fn ptrace
 will return
 .Li -1
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 9bd262001fa..5b318968fa6 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigaction.2,v 1.75 2018/02/27 03:29:50 schwarze Exp $
+.\"	$OpenBSD: sigaction.2,v 1.76 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: sigaction.2,v 1.7 1995/10/12 15:41:16 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sigaction.2	8.2 (Berkeley) 4/3/94
 .\"
-.Dd $Mdocdate: February 27 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SIGACTION 2
 .Os
 .Sh NAME
@@ -116,7 +116,7 @@ before the signal's delivery.
 If the process wishes to resume in a different context, then it
 must arrange to restore the previous context itself.
 .Pp
-When a signal is delivered to a process a new signal mask is
+When a signal is delivered to a process, a new signal mask is
 installed for the duration of the process' signal handler
 (or until a
 .Xr sigprocmask 2
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 2b6ce203287..eedefac9b07 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigaltstack.2,v 1.24 2021/11/21 23:44:55 jan Exp $
+.\"	$OpenBSD: sigaltstack.2,v 1.25 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: sigaltstack.2,v 1.3 1995/02/27 10:41:52 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1992, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)sigaltstack.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SIGALTSTACK 2
 .Os
 .Sh NAME
@@ -136,7 +136,7 @@ Signal stacks may or may not be protected by the hardware and
 are not
 .Dq grown
 automatically as is done for the normal stack.
-If the stack overflows and this space is not protected
+If the stack overflows and this space is not protected,
 unpredictable results may occur.
 .Sh RETURN VALUES
 .Rv -std
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 5fc2194e742..89848869c92 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: socket.2,v 1.43 2019/05/26 09:47:28 krw Exp $
+.\"	$OpenBSD: socket.2,v 1.44 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: socket.2,v 1.5 1995/02/27 12:37:53 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)socket.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 26 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SOCKET 2
 .Os
 .Sh NAME
@@ -152,7 +152,7 @@ calls or some variant of the
 and
 .Xr recv 2
 calls.
-When a session has been completed a
+When a session has been completed, a
 .Xr close 2
 may be performed.
 Out-of-band data may also be transmitted as described in
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index f2eca1f7136..91e6851be84 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sync.2,v 1.16 2016/01/09 21:27:28 mmcc Exp $
+.\"	$OpenBSD: sync.2,v 1.17 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: sync.2,v 1.4 1995/02/27 12:38:41 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 9 2016 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SYNC 2
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@ function forces a write of dirty (modified) buffers
 in the block buffer cache out to disk.
 The kernel keeps this information in core to reduce
 the number of disk I/O transfers required by the system.
-As information in the cache is lost after a system crash a
+As information in the cache is lost after a system crash, a
 .Fn sync
 call is issued frequently by the in-kernel process update
 (about every 30 seconds).
diff --git a/lib/libc/sys/sysctl.2 b/lib/libc/sys/sysctl.2
index 0e0f0a4fb19..0e41e245b82 100644
--- a/lib/libc/sys/sysctl.2
+++ b/lib/libc/sys/sysctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.2,v 1.47 2022/02/19 09:12:09 jsg Exp $
+.\"	$OpenBSD: sysctl.2,v 1.48 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 19 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SYSCTL 2
 .Os
 .Sh NAME
@@ -2073,16 +2073,16 @@ Get or set global information about MPLS (Multiprotocol Label Switching).
 Set or get the default TTL value which is used for MPLS (Shim) Header.
 The default is 255.
 .It Dv MPLSCTL_MAPTTL_IP Pq Va net.mpls.mapttl_ip
-If set to 1 the TTL field is synchronized between the IP header and the
+If set to 1, the TTL field is synchronized between the IP header and the
 MPLS label stack.
-If set to 0 the IP header TTL is not modified while passing through MPLS
+If set to 0, the IP header TTL is not modified while passing through MPLS
 and the MPLS label stack is initialized with the
 .Dv MPLSCTL_DEFTTL .
 The default is 1.
 .It Dv MPLSCTL_MAPTTL_IP6 Pq Va net.mpls.mapttl_ip6
-If set to 1 the TTL field is synchronized between the IPv6 header and the
+If set to 1, the TTL field is synchronized between the IPv6 header and the
 MPLS label stack.
-If set to 0 the IPv6 header TTL is not modified while passing through MPLS
+If set to 0, the IPv6 header TTL is not modified while passing through MPLS
 and the MPLS label stack is initialized with the
 .Dv MPLSCTL_DEFTTL .
 The default is 0.
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 35376a13518..1e0f254c577 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: write.2,v 1.43 2021/11/21 23:44:55 jan Exp $
+.\"	$OpenBSD: write.2,v 1.44 2022/03/31 17:27:16 naddy Exp $
 .\"	$NetBSD: write.2,v 1.6 1995/02/27 12:39:43 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)write.2	8.5 (Berkeley) 4/2/94
 .\"
-.Dd $Mdocdate: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt WRITE 2
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ a writable set-user-ID file owned by the superuser.
 .Pp
 If
 .Fn write
-succeeds it will update the st_ctime and st_mtime fields of the file's
+succeeds, it will update the st_ctime and st_mtime fields of the file's
 meta-data (see
 .Xr stat 2 ) .
 .Pp
diff --git a/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3 b/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
index a53723fbfd6..15156ffca32 100644
--- a/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
+++ b/lib/libcrypto/man/ACCESS_DESCRIPTION_new.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ACCESS_DESCRIPTION_new.3,v 1.5 2019/06/06 01:06:58 schwarze Exp $
+.\"	$OpenBSD: ACCESS_DESCRIPTION_new.3,v 1.6 2022/03/31 17:27:16 naddy Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 6 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt ACCESS_DESCRIPTION_NEW 3
 .Os
 .Sh NAME
@@ -94,7 +94,7 @@ object, which is a
 and represents an ASN.1
 .Vt AuthorityInfoAccessSyntax
 structure defined in RFC 5280 section 4.2.2.1.
-If can be used for the authority information access extension of
+It can be used for the authority information access extension of
 certificates and certificate revocation lists and for the subject
 information access extension of certificates.
 .Fn AUTHORITY_INFO_ACCESS_free
diff --git a/lib/libcrypto/man/ASN1_TIME_set.3 b/lib/libcrypto/man/ASN1_TIME_set.3
index b966165fb21..cd6ab937d02 100644
--- a/lib/libcrypto/man/ASN1_TIME_set.3
+++ b/lib/libcrypto/man/ASN1_TIME_set.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_TIME_set.3,v 1.16 2021/11/21 17:35:53 schwarze Exp $
+.\" $OpenBSD: ASN1_TIME_set.3,v 1.17 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +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: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt ASN1_TIME_SET 3
 .Os
 .Sh NAME
@@ -321,7 +321,7 @@ If both
 .Pf * Fa pday
 and
 .Pf * Fa psec
-are nonzero they will always have the same sign.
+are nonzero, they will always have the same sign.
 The value of
 .Pf * Fa psec
 will always be less than the number of seconds in a day.
diff --git a/lib/libcrypto/man/BIO_f_buffer.3 b/lib/libcrypto/man/BIO_f_buffer.3
index 21a6e9a5fe8..27baf7270cb 100644
--- a/lib/libcrypto/man/BIO_f_buffer.3
+++ b/lib/libcrypto/man/BIO_f_buffer.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_f_buffer.3,v 1.10 2018/05/01 17:05:05 schwarze Exp $
+.\"	$OpenBSD: BIO_f_buffer.3,v 1.11 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL 9b86974e Mar 19 12:32:14 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 1 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BIO_F_BUFFER 3
 .Os
 .Sh NAME
@@ -132,7 +132,7 @@ bytes of
 .Fa buf .
 If
 .Fa num
-is larger than the current buffer size the buffer is expanded.
+is larger than the current buffer size, the buffer is expanded.
 .Pp
 Except
 .Fn BIO_f_buffer ,
diff --git a/lib/libcrypto/man/BIO_s_accept.3 b/lib/libcrypto/man/BIO_s_accept.3
index 4ead28b62f7..c33abee9014 100644
--- a/lib/libcrypto/man/BIO_s_accept.3
+++ b/lib/libcrypto/man/BIO_s_accept.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_s_accept.3,v 1.11 2018/05/12 20:12:17 schwarze Exp $
+.\"	$OpenBSD: BIO_s_accept.3,v 1.12 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL c03726ca Thu Aug 27 12:28:08 2015 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@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: May 12 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BIO_S_ACCEPT 3
 .Os
 .Sh NAME
@@ -223,7 +223,7 @@ incoming connection before processing I/O calls.
 When an accept BIO is not at then end of a chain,
 it passes I/O calls to the next BIO in the chain.
 .Pp
-When a connection is established a new socket BIO is created
+When a connection is established, a new socket BIO is created
 for the connection and appended to the chain.
 That is the chain is now accept->socket.
 This effectively means that attempting I/O on an initial accept
diff --git a/lib/libcrypto/man/BIO_s_bio.3 b/lib/libcrypto/man/BIO_s_bio.3
index 171207dfe14..bf4e8738b56 100644
--- a/lib/libcrypto/man/BIO_s_bio.3
+++ b/lib/libcrypto/man/BIO_s_bio.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_s_bio.3,v 1.13 2018/05/01 17:05:05 schwarze Exp $
+.\"	$OpenBSD: BIO_s_bio.3,v 1.14 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL c03726ca Aug 27 12:28:08 2015 -0400
 .\"
 .\" This file was written by
@@ -53,7 +53,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 1 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BIO_S_BIO 3
 .Os
 .Sh NAME
@@ -182,7 +182,7 @@ sets the write buffer size of BIO
 .Fa b
 to
 .Fa size .
-If the size is not initialized a default value is used.
+If the size is not initialized, a default value is used.
 This is currently 17K, sufficient for a maximum size TLS record.
 .Pp
 .Fn BIO_get_write_buf_size
@@ -255,7 +255,7 @@ or
 .Xr SSL_free 3
 call, the other half still needs to be freed.
 .Pp
-When used in bidirectional applications (such as TLS/SSL)
+When used in bidirectional applications (such as TLS/SSL),
 care should be taken to flush any data in the write buffer.
 This can be done by calling
 .Xr BIO_pending 3
diff --git a/lib/libcrypto/man/BIO_s_connect.3 b/lib/libcrypto/man/BIO_s_connect.3
index 7ddde85f539..2732e9bc9ce 100644
--- a/lib/libcrypto/man/BIO_s_connect.3
+++ b/lib/libcrypto/man/BIO_s_connect.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: BIO_s_connect.3,v 1.11 2018/05/12 20:12:17 schwarze Exp $
+.\"	$OpenBSD: BIO_s_connect.3,v 1.12 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@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: May 12 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt BIO_S_CONNECT 3
 .Os
 .Sh NAME
@@ -159,7 +159,7 @@ and also returns the socket.
 If
 .Fa c
 is not
-.Dv NULL
+.Dv NULL ,
 it should be of type
 .Vt "int *" .
 .Pp
diff --git a/lib/libcrypto/man/CMS_get0_RecipientInfos.3 b/lib/libcrypto/man/CMS_get0_RecipientInfos.3
index e431b2cb36e..094d6ec487e 100644
--- a/lib/libcrypto/man/CMS_get0_RecipientInfos.3
+++ b/lib/libcrypto/man/CMS_get0_RecipientInfos.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_get0_RecipientInfos.3,v 1.7 2019/11/02 15:39:46 schwarze Exp $
+.\" $OpenBSD: CMS_get0_RecipientInfos.3,v 1.8 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@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: November 2 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt CMS_GET0_RECIPIENTINFOS 3
 .Os
 .Sh NAME
@@ -255,7 +255,7 @@ Depending on the type, the
 structure can be ignored or its key identifier data retrieved using
 an appropriate function.
 If the corresponding secret or private key can be obtained by any
-appropriate means it can then be associated with the structure and
+appropriate means, it can then be associated with the structure and
 .Fn CMS_RecipientInfo_decrypt
 called.
 If successful,
diff --git a/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/lib/libcrypto/man/CRYPTO_set_ex_data.3
index c78076b8a8b..9d72b85642d 100644
--- a/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.12 2019/08/16 12:16:22 schwarze Exp $
+.\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.13 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to:
 .\" OpenSSL CRYPTO_get_ex_new_index 9e183d22 Mar 11 08:56:44 2017 -0500
 .\" selective merge up to: 72a7a702 Feb 26 14:05:09 2019 +0000
@@ -52,7 +52,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 16 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt CRYPTO_SET_EX_DATA 3
 .Os
 .Sh NAME
@@ -156,7 +156,7 @@ header file.
 .Pp
 The API described here is used by OpenSSL to manipulate exdata for
 specific structures.
-Since the application data can be anything at all it is passed and
+Since the application data can be anything at all, it is passed and
 retrieved as a
 .Vt void *
 type.
diff --git a/lib/libcrypto/man/DES_set_key.3 b/lib/libcrypto/man/DES_set_key.3
index da58957d365..e74c7c5e488 100644
--- a/lib/libcrypto/man/DES_set_key.3
+++ b/lib/libcrypto/man/DES_set_key.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: DES_set_key.3,v 1.14 2019/06/06 01:06:58 schwarze Exp $
+.\" $OpenBSD: DES_set_key.3,v 1.15 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to:
 .\" OpenSSL man3/DES_random_key 521738e9 Oct 5 14:58:30 2018 -0400
 .\"
@@ -115,7 +115,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: June 6 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt DES_SET_KEY 3
 .Os
 .Sh NAME
@@ -747,7 +747,7 @@ If set to
 .Dv DES_PCBC_MODE
 (the default), DES_pcbc_encrypt is used.
 If set to
-.Dv DES_CBC_MODE
+.Dv DES_CBC_MODE ,
 DES_cbc_encrypt is used.
 .Sh RETURN VALUES
 .Fn DES_set_key ,
diff --git a/lib/libcrypto/man/EC_GROUP_new.3 b/lib/libcrypto/man/EC_GROUP_new.3
index a02104f9676..ef7251fa3d4 100644
--- a/lib/libcrypto/man/EC_GROUP_new.3
+++ b/lib/libcrypto/man/EC_GROUP_new.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: EC_GROUP_new.3,v 1.13 2021/05/11 04:22:32 tb Exp $
+.\"	$OpenBSD: EC_GROUP_new.3,v 1.14 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL 6328d367 Sat Jul 4 21:58:30 2020 +0200
 .\"
 .\" This file was written by Matt Caswell <matt@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: May 11 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EC_GROUP_NEW 3
 .Os
 .Sh NAME
@@ -288,7 +288,7 @@ item has a unique integer ID
 .Pq Fa nid
 and a human readable comment string describing the curve.
 .Pp
-In order to construct a builtin curve use the function
+In order to construct a builtin curve, use the function
 .Fn EC_GROUP_new_by_curve_name
 and provide the
 .Fa nid
diff --git a/lib/libcrypto/man/ERR_put_error.3 b/lib/libcrypto/man/ERR_put_error.3
index 142d2eb2bdd..7eac5e415c7 100644
--- a/lib/libcrypto/man/ERR_put_error.3
+++ b/lib/libcrypto/man/ERR_put_error.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ERR_put_error.3,v 1.9 2018/03/27 17:35:50 schwarze Exp $
+.\"	$OpenBSD: ERR_put_error.3,v 1.10 2022/03/31 17:27:16 naddy Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@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: March 31 2022 $
 .Dt ERR_PUT_ERROR 3
 .Os
 .Sh NAME
@@ -128,7 +128,7 @@ Function and reason codes should consist of upper case characters,
 numbers and underscores only.
 The error file generation script translates function codes into function
 names by looking in the header files for an appropriate function name.
-If none is found it just uses the capitalized form such as "SSL23_READ"
+If none is found, it just uses the capitalized form such as "SSL23_READ"
 in the above example.
 .Pp
 The trailing section of a reason code (after the "_R_") is translated
diff --git a/lib/libcrypto/man/EVP_DigestInit.3 b/lib/libcrypto/man/EVP_DigestInit.3
index 9b2ee4e09fa..b9aacf9e9f9 100644
--- a/lib/libcrypto/man/EVP_DigestInit.3
+++ b/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.22 2022/01/15 09:08:51 tb Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.23 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
 .\" selective merge up to: OpenSSL a95d7574 Jul 2 12:16:38 2017 -0400
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 15 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -457,7 +457,7 @@ For example
 .Fn EVP_sha1
 is associated with RSA so this will return
 .Dv NID_sha1WithRSAEncryption .
-Since digests and signature algorithms are no longer linked this
+Since digests and signature algorithms are no longer linked, this
 function is only retained for compatibility reasons.
 .Pp
 .Fn EVP_md5 ,
diff --git a/lib/libcrypto/man/EVP_EncryptInit.3 b/lib/libcrypto/man/EVP_EncryptInit.3
index 58d18346e12..47527925ba3 100644
--- a/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_EncryptInit.3,v 1.42 2021/10/14 00:45:02 tb Exp $
+.\" $OpenBSD: EVP_EncryptInit.3,v 1.43 2022/03/31 17:27:16 naddy Exp $
 .\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
 .\"   EVP_bf_cbc.pod EVP_cast5_cbc.pod EVP_idea_cbc.pod EVP_rc2_cbc.pod
 .\"   7c6d372a Nov 20 13:20:01 2018 +0000
@@ -71,7 +71,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 14 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_ENCRYPTINIT 3
 .Os
 .Sh NAME
@@ -535,7 +535,7 @@ The encrypted final data is written to
 which should have sufficient space for one cipher block.
 The number of bytes written is placed in
 .Fa outl .
-After this function is called the encryption operation is finished and
+After this function is called, the encryption operation is finished and
 no further calls to
 .Fn EVP_EncryptUpdate
 should be made.
@@ -754,7 +754,7 @@ This "type" is the actual NID of the cipher OBJECT IDENTIFIER as such it
 ignores the cipher parameters and 40-bit RC2 and 128-bit RC2 have the
 same NID.
 If the cipher does not have an object identifier or does not
-have ASN.1 support this function will return
+have ASN.1 support, this function will return
 .Dv NID_undef .
 .Pp
 .Fn EVP_CIPHER_CTX_cipher
@@ -842,7 +842,7 @@ block size n will equal the block size.
 For example if the block size is 8 and 11 bytes are to be encrypted then
 5 padding bytes of value 5 will be added.
 .Pp
-When decrypting the final block is checked to see if it has the correct
+When decrypting, the final block is checked to see if it has the correct
 form.
 .Pp
 Although the decryption operation can produce an error if padding is
@@ -1374,7 +1374,7 @@ first appeared in LibreSSL 2.8.1 and has been available since
 and
 .Dv EVP_MAX_IV_LENGTH
 only refer to the internal ciphers with default key lengths.
-If custom ciphers exceed these values the results are unpredictable.
+If custom ciphers exceed these values, the results are unpredictable.
 This is because it has become standard practice to define a generic key
 as a fixed unsigned char array containing
 .Dv EVP_MAX_KEY_LENGTH
diff --git a/lib/libcrypto/man/EVP_PKEY_decrypt.3 b/lib/libcrypto/man/EVP_PKEY_decrypt.3
index cdae726c427..af5ed93fba7 100644
--- a/lib/libcrypto/man/EVP_PKEY_decrypt.3
+++ b/lib/libcrypto/man/EVP_PKEY_decrypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_PKEY_decrypt.3,v 1.7 2018/03/23 04:34:23 schwarze Exp $
+.\" $OpenBSD: EVP_PKEY_decrypt.3,v 1.8 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL 48e5119a Jan 19 10:49:22 2018 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 23 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_PKEY_DECRYPT 3
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ then before the call the
 parameter should contain the length of the
 .Fa out
 buffer.
-If the call is successful the decrypted data is written to
+If the call is successful, the decrypted data is written to
 .Fa out
 and the amount of data written to
 .Fa outlen .
diff --git a/lib/libcrypto/man/EVP_PKEY_encrypt.3 b/lib/libcrypto/man/EVP_PKEY_encrypt.3
index a627c2abb69..210c43d6d8d 100644
--- a/lib/libcrypto/man/EVP_PKEY_encrypt.3
+++ b/lib/libcrypto/man/EVP_PKEY_encrypt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: EVP_PKEY_encrypt.3,v 1.6 2018/03/23 04:34:23 schwarze Exp $
+.\"	$OpenBSD: EVP_PKEY_encrypt.3,v 1.7 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 23 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_PKEY_ENCRYPT 3
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ then before the call the
 parameter should contain the length of the
 .Fa out
 buffer.
-If the call is successful the encrypted data is written to
+If the call is successful, the encrypted data is written to
 .Fa out
 and the amount of data written to
 .Fa outlen .
diff --git a/lib/libcrypto/man/EVP_PKEY_sign.3 b/lib/libcrypto/man/EVP_PKEY_sign.3
index efbea950c94..fbd8e663762 100644
--- a/lib/libcrypto/man/EVP_PKEY_sign.3
+++ b/lib/libcrypto/man/EVP_PKEY_sign.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: EVP_PKEY_sign.3,v 1.7 2018/03/23 04:34:23 schwarze Exp $
+.\"	$OpenBSD: EVP_PKEY_sign.3,v 1.8 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 23 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_PKEY_SIGN 3
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ then before the call the
 parameter should contain the length of the
 .Fa sig
 buffer.
-If the call is successful the signature is written to
+If the call is successful, the signature is written to
 .Fa sig
 and the amount of data written to
 .Fa siglen .
diff --git a/lib/libcrypto/man/EVP_SignInit.3 b/lib/libcrypto/man/EVP_SignInit.3
index a53d059b46d..06aeb2f141c 100644
--- a/lib/libcrypto/man/EVP_SignInit.3
+++ b/lib/libcrypto/man/EVP_SignInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_SignInit.3,v 1.14 2019/06/10 14:58:48 schwarze Exp $
+.\" $OpenBSD: EVP_SignInit.3,v 1.15 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\" selective merge up to: OpenSSL 79b49fb0 Mar 20 10:03:10 2018 +1000
 .\"
@@ -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 10 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVP_SIGNINIT 3
 .Os
 .Sh NAME
@@ -217,7 +217,7 @@ could not be made after calling
 .Fn EVP_SignFinal .
 .Pp
 Since the private key is passed in the call to
-.Fn EVP_SignFinal
+.Fn EVP_SignFinal ,
 any error relating to the private key (for example an unsuitable key and
 digest combination) will not be indicated until after potentially large
 amounts of data have been passed through
diff --git a/lib/libcrypto/man/OBJ_nid2obj.3 b/lib/libcrypto/man/OBJ_nid2obj.3
index 511bf8567a5..4b35762dcfa 100644
--- a/lib/libcrypto/man/OBJ_nid2obj.3
+++ b/lib/libcrypto/man/OBJ_nid2obj.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OBJ_nid2obj.3,v 1.18 2021/12/18 17:47:45 schwarze Exp $
+.\" $OpenBSD: OBJ_nid2obj.3,v 1.19 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL c264592d May 14 11:28:00 2006 +0000
 .\" selective merge up to: OpenSSL 35fd9953 May 28 14:49:38 2019 +0200
 .\"
@@ -67,7 +67,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 18 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OBJ_NID2OBJ 3
 .Os
 .Sh NAME
@@ -206,7 +206,7 @@ is 0 then long names and short names will be interpreted as well as
 numerical forms.
 If
 .Fa no_name
-is 1 only the numerical form is acceptable.
+is 1, only the numerical form is acceptable.
 .Pp
 .Fn OBJ_obj2txt
 converts the
diff --git a/lib/libcrypto/man/OCSP_cert_to_id.3 b/lib/libcrypto/man/OCSP_cert_to_id.3
index f2ed8b11543..73a21867b9c 100644
--- a/lib/libcrypto/man/OCSP_cert_to_id.3
+++ b/lib/libcrypto/man/OCSP_cert_to_id.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: OCSP_cert_to_id.3,v 1.11 2021/08/06 21:45:55 schwarze Exp $
+.\"	$OpenBSD: OCSP_cert_to_id.3,v 1.12 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 6 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OCSP_CERT_TO_ID 3
 .Os
 .Sh NAME
@@ -180,7 +180,7 @@ and
 returns the issuer name hash, hash OID, issuer key hash and serial
 number contained in
 .Fa cid .
-If any of the values are not required the corresponding parameter can be
+If any of the values are not required, the corresponding parameter can be
 set to
 .Dv NULL .
 The values returned by
diff --git a/lib/libcrypto/man/OCSP_resp_find_status.3 b/lib/libcrypto/man/OCSP_resp_find_status.3
index bcfefb5754a..06d0354bd62 100644
--- a/lib/libcrypto/man/OCSP_resp_find_status.3
+++ b/lib/libcrypto/man/OCSP_resp_find_status.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OCSP_resp_find_status.3,v 1.10 2019/08/27 10:00:41 schwarze Exp $
+.\" $OpenBSD: OCSP_resp_find_status.3,v 1.11 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL c952780c Jun 21 07:03:34 2016 -0400
 .\" selective merge up to: OpenSSL 1212818e Sep 11 13:22:14 2018 +0100
 .\"
@@ -67,7 +67,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 27 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OCSP_RESP_FIND_STATUS 3
 .Os
 .Sh NAME
@@ -295,11 +295,11 @@ or
 .Fn OCSP_single_get0_status .
 If
 .Fa sec
-is non-zero it indicates how many seconds leeway should be allowed in
+is non-zero, it indicates how many seconds leeway should be allowed in
 the check.
 If
 .Fa maxsec
-is positive it indicates the maximum age of
+is positive, it indicates the maximum age of
 .Fa thisupd
 in seconds.
 .Pp
diff --git a/lib/libcrypto/man/OCSP_sendreq_new.3 b/lib/libcrypto/man/OCSP_sendreq_new.3
index c8107c4d586..300f7195258 100644
--- a/lib/libcrypto/man/OCSP_sendreq_new.3
+++ b/lib/libcrypto/man/OCSP_sendreq_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: OCSP_sendreq_new.3,v 1.9 2019/08/27 10:48:41 schwarze Exp $
+.\" $OpenBSD: OCSP_sendreq_new.3,v 1.10 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 27 2019 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OCSP_SENDREQ_NEW 3
 .Os
 .Sh NAME
@@ -159,7 +159,7 @@ should be set to
 .Fn OCSP_sendreq_nbio
 performs non-blocking I/O on the OCSP request context
 .Fa rctx .
-When the operation is complete it returns the response in
+When the operation is complete, it returns the response in
 .Pf * Fa presp .
 If
 .Fn OCSP_sendreq_nbio
diff --git a/lib/libcrypto/man/PKCS12_create.3 b/lib/libcrypto/man/PKCS12_create.3
index d19a6f3e44f..bc00d3df788 100644
--- a/lib/libcrypto/man/PKCS12_create.3
+++ b/lib/libcrypto/man/PKCS12_create.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: PKCS12_create.3,v 1.11 2021/10/22 15:50:19 schwarze Exp $
+.\" $OpenBSD: PKCS12_create.3,v 1.12 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PKCS12_CREATE 3
 .Os
 .Sh NAME
@@ -137,10 +137,10 @@ should be set to PKCS12_DEFAULT_ITER.
 adds a flag to the store private key.
 This is a non-standard extension that is only currently interpreted by
 MSIE.
-If set to zero the flag is omitted; if set to
-.Dv KEY_SIG
+If set to zero, the flag is omitted; if set to
+.Dv KEY_SIG ,
 the key can be used for signing only; and if set to
-.Dv KEY_EX
+.Dv KEY_EX ,
 it can be used for signing and encryption.
 This option was useful for old export grade software which could use
 signing only keys of arbitrary size but had restrictions on the
diff --git a/lib/libcrypto/man/PKCS7_verify.3 b/lib/libcrypto/man/PKCS7_verify.3
index 2895da16d85..d091c03dfd5 100644
--- a/lib/libcrypto/man/PKCS7_verify.3
+++ b/lib/libcrypto/man/PKCS7_verify.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: PKCS7_verify.3,v 1.10 2022/01/19 20:28:06 tb Exp $
+.\"	$OpenBSD: PKCS7_verify.3,v 1.11 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@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: January 19 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PKCS7_VERIFY 3
 .Os
 .Sh NAME
@@ -133,13 +133,13 @@ parameter (if it is not
 and then looking in any certificates contained in the
 .Fa p7
 structure itself.
-If any signer's certificates cannot be located the operation fails.
+If any signer's certificates cannot be located, the operation fails.
 .Pp
 Each signer's certificate is chain verified using the
 .Sy smimesign
 purpose and the supplied trusted certificate store.
 Any internal certificates in the message are used as untrusted CAs.
-If any chain verify fails an error code is returned.
+If any chain verify fails, an error code is returned.
 .Pp
 Finally, the signed content is read (and written to
 .Fa out
diff --git a/lib/libcrypto/man/RSA_get_ex_new_index.3 b/lib/libcrypto/man/RSA_get_ex_new_index.3
index cf3d3f6fd7a..ee1e0e82f7b 100644
--- a/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.10 2018/03/23 23:18:17 schwarze Exp $
+.\"	$OpenBSD: RSA_get_ex_new_index.3,v 1.11 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 23 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
@@ -117,7 +117,7 @@ with a structure (for example the hash of some part of the structure) or
 some additional data (for example a handle to the data in an external
 library).
 .Pp
-Since the application data can be anything at all it is passed and
+Since the application data can be anything at all, it is passed and
 retrieved as a
 .Vt void *
 type.
diff --git a/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 b/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
index cd7e94d4e1a..3c1237d20e1 100644
--- a/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
+++ b/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.15 2021/12/09 19:01:52 schwarze Exp $
+.\"	$OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.16 2022/03/31 17:27:17 naddy Exp $
 .\"	OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 9 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt X509_NAME_ADD_ENTRY_BY_TXT 3
 .Os
 .Sh NAME
@@ -205,11 +205,11 @@ if it is -1 it is appended.
 .Pp
 .Fa set
 determines how the new type is added.
-If it is zero a new RDN is created.
+If it is zero, a new RDN is created.
 .Pp
 If
 .Fa set
-is -1 or 1 it is added to the previous or next RDN structure
+is -1 or 1, it is added to the previous or next RDN structure
 respectively.
 This will then be a multivalued RDN: since multivalue RDNs are very
 seldom used,
diff --git a/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 b/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
index 8964d612b2e..fdcfd4834e3 100644
--- a/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
+++ b/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_VERIFY_PARAM_set_flags.3,v 1.24 2022/03/29 14:27:59 naddy Exp $
+.\" $OpenBSD: X509_VERIFY_PARAM_set_flags.3,v 1.25 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL d33def66 Feb 9 14:17:13 2016 -0500
 .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 29 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt X509_VERIFY_PARAM_SET_FLAGS 3
 .Os
 .Sh NAME
@@ -493,7 +493,7 @@ enables CRL checking for the entire certificate chain.
 disables critical extension checking.
 By default any unhandled critical extensions in certificates or (if
 checked) CRLs results in a fatal error.
-If this flag is set unhandled critical extensions are ignored.
+If this flag is set, unhandled critical extensions are ignored.
 .Sy WARNING :
 setting this option for anything other than debugging purposes can be a
 security risk.
@@ -539,7 +539,7 @@ By default some additional features such as indirect CRLs and CRLs
 signed by different keys are disabled.
 If
 .Dv X509_V_FLAG_EXTENDED_CRL_SUPPORT
-is set they are enabled.
+is set, they are enabled.
 .Pp
 If
 .Dv X509_V_FLAG_USE_DELTAS
diff --git a/lib/libcrypto/man/X509_get_pubkey.3 b/lib/libcrypto/man/X509_get_pubkey.3
index 506404d9ace..0829397982a 100644
--- a/lib/libcrypto/man/X509_get_pubkey.3
+++ b/lib/libcrypto/man/X509_get_pubkey.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_get_pubkey.3,v 1.12 2021/10/26 18:05:07 tb Exp $
+.\" $OpenBSD: X509_get_pubkey.3,v 1.13 2022/03/31 17:27:17 naddy Exp $
 .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 26 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt X509_GET_PUBKEY 3
 .Os
 .Sh NAME
@@ -128,7 +128,7 @@
 .Fn X509_get_pubkey
 attempts to decode the public key for certificate
 .Fa x .
-If successful it returns the public key as an
+If successful, it returns the public key as an
 .Vt EVP_PKEY
 pointer with its reference count incremented: this means the returned
 key must be freed up after use.
diff --git a/lib/libcrypto/man/lh_new.3 b/lib/libcrypto/man/lh_new.3
index a9ac283a904..c848eed825e 100644
--- a/lib/libcrypto/man/lh_new.3
+++ b/lib/libcrypto/man/lh_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lh_new.3,v 1.8 2021/12/17 16:32:07 schwarze Exp $
+.\" $OpenBSD: lh_new.3,v 1.9 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to:
 .\" OpenSSL doc/crypto/lhash.pod 1bc74519 May 20 08:11:46 2016 -0400
 .\" selective merge up to:
@@ -118,7 +118,7 @@
 .\" copied and put under another distribution licence
 .\" [including the GNU Public Licence.]
 .\"
-.Dd $Mdocdate: December 17 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt LH_NEW 3
 .Os
 .Sh NAME
@@ -488,7 +488,7 @@ The load is the number of items in the hash table divided by the size of
 the hash table.
 The default values are as follows.
 If (hash->up_load < load) => expand.
-if (hash->down_load > load) => contract.
+If (hash->down_load > load) => contract.
 The
 .Fa up_load
 has a default value of 1 and
@@ -503,12 +503,12 @@ variables.
 The 'load' is kept in a form which is multiplied by 256.
 So hash->up_load=8*256 will cause a load of 8 to be set.
 .Pp
-If you are interested in performance the field to watch is
+If you are interested in performance, the field to watch is
 .Fa num_comp_calls .
 The hash library keeps track of the 'hash' value for each item so when a
 lookup is done, the 'hashes' are compared, if there is a match, then a
 full compare is done, and hash->num_comp_calls is incremented.
-If num_comp_calls is not equal to num_delete plus num_retrieve it means
+If num_comp_calls is not equal to num_delete plus num_retrieve, it means
 that your hash function is generating hashes that are the same for
 different values.
 It is probably worth changing your hash function if this is the case
diff --git a/lib/libcrypto/man/openssl.cnf.5 b/lib/libcrypto/man/openssl.cnf.5
index ae56869b8b8..48ca66cf4b9 100644
--- a/lib/libcrypto/man/openssl.cnf.5
+++ b/lib/libcrypto/man/openssl.cnf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.cnf.5,v 1.7 2020/02/17 12:52:42 inoguchi Exp $
+.\" $OpenBSD: openssl.cnf.5,v 1.8 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to: OpenSSL man5/config b53338cb Feb 28 12:30:28 2017 +0100
 .\" selective merge up to: OpenSSL a8c5ed81 Jul 18 13:57:25 2017 -0400
 .\"
@@ -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: February 17 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt OPENSSL.CNF 5
 .Os
 .Sh NAME
@@ -265,7 +265,7 @@ bar = bar_section
 The command
 .Ic engine_id
 is used to give the ENGINE name.
-If used this command must be first.
+If used, this command must be first.
 For example:
 .Bd -literal -offset indent
 [engine_section]
@@ -305,7 +305,7 @@ The command
 sets the default algorithms an ENGINE will supply using the functions
 .Xr ENGINE_set_default_string 3 .
 .Pp
-If the name matches none of the above command names it is assumed
+If the name matches none of the above command names, it is assumed
 to be a ctrl command which is sent to the ENGINE.
 The value of the command is the argument to the ctrl command.
 If the value is the string
diff --git a/lib/libcrypto/man/x509v3.cnf.5 b/lib/libcrypto/man/x509v3.cnf.5
index 392c44d456f..89f52d6a012 100644
--- a/lib/libcrypto/man/x509v3.cnf.5
+++ b/lib/libcrypto/man/x509v3.cnf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: x509v3.cnf.5,v 1.7 2020/06/11 18:03:19 jmc Exp $
+.\" $OpenBSD: x509v3.cnf.5,v 1.8 2022/03/31 17:27:17 naddy Exp $
 .\" full merge up to:
 .\" OpenSSL man5/x509v3_config a41815f0 Mar 17 18:43:53 2017 -0700
 .\" selective merge up to: OpenSSL 36cf10cf Oct 4 02:11:08 2017 -0400
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 11 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt X509V3.CNF 5
 .Os
 .Sh NAME
@@ -163,7 +163,7 @@ parameter indicates the maximum number of CAs that can appear below
 this one in a chain.
 So if you have a CA with a
 .Ic pathlen
-of zero it can only be used to sign end user certificates and not
+of zero, it can only be used to sign end user certificates and not
 further CAs.
 .Ss Key usage
 Key usage is a multi-valued extension consisting of a list of names of
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 035768a394b..e298f692ee9 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editline.3,v 1.48 2021/08/14 11:30:12 schwarze Exp $
+.\"	$OpenBSD: editline.3,v 1.49 2022/03/31 17:27:17 naddy Exp $
 .\"	$NetBSD: editline.3,v 1.88 2016/02/25 14:59:22 wiz Exp $
 .\"
 .\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 14 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EDITLINE 3
 .Os
 .Sh NAME
@@ -602,7 +602,7 @@ If
 .Fa name
 is a valid
 .Xr termcap 5
-capability set
+capability, set
 .Fa value
 to the current value of that capability.
 .It Dv EL_SIGNAL , Fa "int *s"
@@ -806,9 +806,9 @@ If
 has been called with a non-zero argument, the element
 will not be entered into the history if its contents match
 the ones of the current history element.
-If the element is entered
+If the element is entered,
 .Fn history
-returns 1; if it is ignored as a duplicate returns 0.
+returns 1; if it is ignored as a duplicate, returns 0.
 Finally
 .Fn history
 returns \-1 if an error occurred.
diff --git a/lib/libelf/gelf_newehdr.3 b/lib/libelf/gelf_newehdr.3
index 9babb2d5aca..252d887bea0 100644
--- a/lib/libelf/gelf_newehdr.3
+++ b/lib/libelf/gelf_newehdr.3
@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $Id: gelf_newehdr.3,v 1.3 2020/05/18 06:46:23 jsg Exp $
+.\" $Id: gelf_newehdr.3,v 1.4 2022/03/31 17:27:17 naddy Exp $
 .\"
 .Dd June 12, 2019
 .Dt GELF_NEWEHDR 3
@@ -72,7 +72,7 @@ returns the value returned by
 When argument
 .Ar elfclass
 has value
-.Dv ELFCLASS64
+.Dv ELFCLASS64 ,
 it returns the value returned by
 .Fn elf64_newehdr "elf" .
 .Pp
diff --git a/lib/libevent/event.3 b/lib/libevent/event.3
index 9f9675f2b18..2c62f42a9bd 100644
--- a/lib/libevent/event.3
+++ b/lib/libevent/event.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: event.3,v 1.55 2018/09/23 08:56:19 anton Exp $
+.\"	$OpenBSD: event.3,v 1.56 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 23 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt EVENT_INIT 3
 .Os
 .Sh NAME
@@ -285,7 +285,7 @@ The function
 .Fn event_del
 will cancel the event in the argument
 .Fa ev .
-If the event has already executed or has never been added
+If the event has already executed or has never been added,
 the call will have no effect.
 .Pp
 The functions
@@ -492,7 +492,7 @@ The flags parameter can be a combination of
 .Va EV_READ
 and
 .Va EV_WRITE .
-When read enabled the bufferevent will try to read from the file
+When read enabled, the bufferevent will try to read from the file
 descriptor and call the read callback.
 The write callback is executed
 whenever the output buffer is drained below the write low watermark,
diff --git a/lib/libfuse/fuse_chan_fd.3 b/lib/libfuse/fuse_chan_fd.3
index dc00b04ef03..c66c9069911 100644
--- a/lib/libfuse/fuse_chan_fd.3
+++ b/lib/libfuse/fuse_chan_fd.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_chan_fd.3,v 1.2 2018/07/08 06:17:10 jmc Exp $
+.\" $OpenBSD: fuse_chan_fd.3,v 1.3 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" Copyright (c) 2018 Helg Bredow <helg.bredow@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 8 2018 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt FUSE_CHAN_FD 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@ If successful,
 returns a non-negative integer, termed a file descriptor.
 If
 .Fa ch
-is NULL a value of -1 is returned.
+is NULL, a value of -1 is returned.
 .Sh SEE ALSO
 .Xr fuse_mount 3 ,
 .Xr open 3 ,
diff --git a/lib/libfuse/fuse_new.3 b/lib/libfuse/fuse_new.3
index c36815c7d68..f88cb234fee 100644
--- a/lib/libfuse/fuse_new.3
+++ b/lib/libfuse/fuse_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_new.3,v 1.6 2021/03/12 05:18:01 jsg Exp $
+.\" $OpenBSD: fuse_new.3,v 1.7 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
 .\" Copyright (c) 2018 Helg Bredow <helg@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 12 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt FUSE_NEW 3
 .Os
 .Sh NAME
@@ -221,7 +221,7 @@ The file mode mask applied to the permission for all files by getattr.
 By default, FUSE will return an internal inode number for getattr and
 readdir and this will be different every time the file system is
 mounted.
-If this is set the file system's own inode number will be
+If this is set, the file system's own inode number will be
 reported instead.
 Useful only for file system that have inode numbers.
 .El
diff --git a/lib/libkeynote/keynote.4 b/lib/libkeynote/keynote.4
index 59397bb2fb5..a63d1a1d40c 100644
--- a/lib/libkeynote/keynote.4
+++ b/lib/libkeynote/keynote.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.4,v 1.39 2022/02/18 10:24:32 jsg Exp $
+.\" $OpenBSD: keynote.4,v 1.40 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: February 18 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt KEYNOTE 4
 .\" .TH KeyNote 4 local
 .Os
@@ -311,7 +311,7 @@ begins with an alphabetic or underscore character and can be followed
 by any number of alphanumerics and underscores.
 Attribute names are case sensitive.
 .Pp
-If an action attribute is not defined its value is considered to be
+If an action attribute is not defined, its value is considered to be
 the empty string.
 .Pp
 Attribute names beginning with the
diff --git a/lib/libpthread/man/pthread_attr_setguardsize.3 b/lib/libpthread/man/pthread_attr_setguardsize.3
index e8a7b54f2f6..021971170b8 100644
--- a/lib/libpthread/man/pthread_attr_setguardsize.3
+++ b/lib/libpthread/man/pthread_attr_setguardsize.3
@@ -1,9 +1,9 @@
-.\" $OpenBSD: pthread_attr_setguardsize.3,v 1.2 2013/06/05 03:44:50 tedu Exp $
+.\" $OpenBSD: pthread_attr_setguardsize.3,v 1.3 2022/03/31 17:27:17 naddy Exp $
 .\" Manual page derived from TOG's XPG6 documentation.
 .\"
 .\"  David Leonard, 2000. Public Domain.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PTHREAD_ATTR_SETGUARDSIZE 3
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@ attribute provides protection against overflow of the stack pointer.
 If a thread's stack is created with guard protection,
 the implementation allocates extra memory at the overflow end of
 the stack as a buffer against stack overflow of the stack pointer.
-If an application overflows into this buffer an error shall result
+If an application overflows into this buffer, an error shall result
 (possibly in a SIGSEGV signal being delivered to the thread).
 .Sh RETURN VALUES
 Upon successful completion,
diff --git a/lib/libpthread/man/pthread_barrier_init.3 b/lib/libpthread/man/pthread_barrier_init.3
index 23e13eb8716..3b400ad3831 100644
--- a/lib/libpthread/man/pthread_barrier_init.3
+++ b/lib/libpthread/man/pthread_barrier_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pthread_barrier_init.3,v 1.4 2020/04/06 00:01:08 pirofti Exp $
+.\"	$OpenBSD: pthread_barrier_init.3,v 1.5 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" Copyright (c) 2012 Paul Irofti <paul@irofti.net>
 .\"
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: April 6 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PTHREAD_BARRIER_INIT 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@ and with a threshold specified with
 If
 .Fa attr
 is
-.Dv NULL
+.Dv NULL ,
 the default attributes are used.
 The
 .Fa count
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 3a162cb726f..662d37d13e8 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_cond_init.3,v 1.11 2013/06/05 03:44:50 tedu Exp $
+.\" $OpenBSD: pthread_cond_init.3,v 1.12 2022/03/31 17:27:17 naddy Exp $
 .\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD: pthread_cond_init.3,v 1.6 1999/08/28 00:03:03 peter Exp $
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt PTHREAD_COND_INIT 3
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@ function creates a new condition variable, with attributes specified with
 If
 .Fa attr
 is
-.Dv NULL
+.Dv NULL ,
 the default attributes are used.
 .Sh RETURN VALUES
 If successful, the
diff --git a/lib/libsndio/sio_open.3 b/lib/libsndio/sio_open.3
index b761e7b5080..3bbe4895fde 100644
--- a/lib/libsndio/sio_open.3
+++ b/lib/libsndio/sio_open.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sio_open.3,v 1.52 2020/11/29 08:02:42 ratchov Exp $
+.\" $OpenBSD: sio_open.3,v 1.53 2022/03/31 17:27:18 naddy Exp $
 .\"
 .\" Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 29 2020 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SIO_OPEN 3
 .Os
 .Sh NAME
@@ -538,7 +538,7 @@ frame just written to become audible, expressed in number of frames.
 The exact playback
 latency can be obtained by subtracting the current position
 from the number of frames written.
-Once playback is actually started (first sample audible)
+Once playback is actually started (first sample audible),
 the latency will never exceed the
 .Fa bufsz
 parameter (see the sections above).
diff --git a/lib/libssl/man/BIO_f_ssl.3 b/lib/libssl/man/BIO_f_ssl.3
index 86432002855..5e18a85bd1c 100644
--- a/lib/libssl/man/BIO_f_ssl.3
+++ b/lib/libssl/man/BIO_f_ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BIO_f_ssl.3,v 1.11 2019/06/12 09:36:30 schwarze Exp $
+.\" $OpenBSD: BIO_f_ssl.3,v 1.12 2022/03/31 17:27:18 naddy Exp $
 .\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -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: March 31 2022 $
 .Dt BIO_F_SSL 3
 .Os
 .Sh NAME
@@ -147,7 +147,7 @@ is appended to an
 .Vt SSL
 .Vt BIO
 using
-.Xr BIO_push 3
+.Xr BIO_push 3 ,
 it is automatically used as the
 .Vt SSL
 .Vt BIO Ns 's read and write
@@ -213,7 +213,7 @@ is 0, server mode is set.
 .Fn BIO_set_ssl_renegotiate_bytes
 sets the renegotiate byte count to
 .Fa num .
-When set after every
+When set, after every
 .Fa num
 bytes of I/O (read and write) the SSL session is automatically renegotiated.
 .Fa num
@@ -222,7 +222,7 @@ must be at least 512 bytes.
 .Fn BIO_set_ssl_renegotiate_timeout
 sets the renegotiate timeout to
 .Fa seconds .
-When the renegotiate timeout elapses the session is automatically renegotiated.
+When the renegotiate timeout elapses, the session is automatically renegotiated.
 .Pp
 .Fn BIO_get_num_renegotiates
 returns the total number of session renegotiations due to I/O or timeout.
@@ -303,7 +303,7 @@ established; the call
 should be used for non blocking connect
 .Vt BIO Ns s
 to determine if the call should be retried.
-If an SSL connection has already been established this call has no effect.
+If an SSL connection has already been established, this call has no effect.
 .Pp
 .Vt SSL
 .Vt BIO Ns s
@@ -325,7 +325,7 @@ using a blocking transport will never request a retry.
 Since unknown
 .Xr BIO_ctrl 3
 operations are sent through filter
-.Vt BIO Ns s
+.Vt BIO Ns s ,
 the server name and port can be set using
 .Xr BIO_set_conn_hostname 3
 and
diff --git a/lib/libssl/man/SSL_CTX_set_options.3 b/lib/libssl/man/SSL_CTX_set_options.3
index 34c3a1adfd8..5df0b077858 100644
--- a/lib/libssl/man/SSL_CTX_set_options.3
+++ b/lib/libssl/man/SSL_CTX_set_options.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_CTX_set_options.3,v 1.15 2021/06/12 11:02:20 tb Exp $
+.\" $OpenBSD: SSL_CTX_set_options.3,v 1.16 2022/03/31 17:27:18 naddy Exp $
 .\" full merge up to: OpenSSL 7946ab33 Dec 6 17:56:41 2015 +0100
 .\" selective merge up to: OpenSSL edb79c3a Mar 29 10:07:14 2017 +1000
 .\"
@@ -52,7 +52,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 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SSL_CTX_SET_OPTIONS 3
 .Os
 .Sh NAME
@@ -206,7 +206,7 @@ Normally clients and servers using TLSv1.2 and earlier will, where possible,
 transparently make use of
 RFC 5077 tickets for stateless session resumption.
 .Pp
-If this option is set this functionality is disabled and tickets will not be
+If this option is set, this functionality is disabled and tickets will not be
 used by clients or servers.
 .It Dv SSL_OP_NO_TLSv1
 Do not use the TLSv1.0 protocol.
@@ -273,7 +273,7 @@ server with a
 .Em no_renegotiation
 warning alert.
 .Pp
-If the patched OpenSSL server attempts to renegotiate a fatal
+If the patched OpenSSL server attempts to renegotiate, a fatal
 .Em handshake_failure
 alert is sent.
 This is because the server code may be unaware of the unpatched nature of the
@@ -306,7 +306,7 @@ them initially) and this is clearly not acceptable.
 Renegotiation is permitted because this does not add any additional security
 issues: during an attack clients do not see any renegotiations anyway.
 .Pp
-As more servers become patched the option
+As more servers become patched, the option
 .Dv SSL_OP_LEGACY_SERVER_CONNECT
 will
 .Em not
diff --git a/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 b/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
index ae0349584a1..8be504d3b35 100644
--- a/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
+++ b/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: SSL_CTX_set_tmp_dh_callback.3,v 1.9 2022/02/18 23:17:15 jsg Exp $
+.\"	$OpenBSD: SSL_CTX_set_tmp_dh_callback.3,v 1.10 2022/03/31 17:27:18 naddy Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" 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: February 18 2022 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt SSL_CTX_SET_TMP_DH_CALLBACK 3
 .Os
 .Sh NAME
@@ -117,7 +117,7 @@ when the application is left, it becomes impossible for attackers to decrypt
 past sessions, even if they get hold of the normal (certified) key,
 as this key was only used for signing.
 .Pp
-In order to perform a DH key exchange the server must use a DH group
+In order to perform a DH key exchange, the server must use a DH group
 (DH parameters) and generate a DH key.
 The server will always generate a new DH key during the negotiation.
 .Pp
diff --git a/lib/libssl/man/SSL_get_session.3 b/lib/libssl/man/SSL_get_session.3
index 4cde129bc2b..2ab43fdd3ef 100644
--- a/lib/libssl/man/SSL_get_session.3
+++ b/lib/libssl/man/SSL_get_session.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: SSL_get_session.3,v 1.7 2018/03/27 17:35:50 schwarze Exp $
+.\"	$OpenBSD: SSL_get_session.3,v 1.8 2022/03/31 17:27:18 naddy Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -49,7 +49,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: March 31 2022 $
 .Dt SSL_GET_SESSION 3
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@ If the data is to be kept,
 .Fn SSL_get1_session
 will increment the reference count, so that the session will not be implicitly
 removed by other operations but stays in memory.
-In order to remove the session
+In order to remove the session,
 .Xr SSL_SESSION_free 3
 must be explicitly called once to decrement the reference count again.
 .Pp
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index f9a555a130f..e1c4d512889 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usbhid.3,v 1.22 2021/05/30 19:54:52 jcs Exp $
+.\"	$OpenBSD: usbhid.3,v 1.23 2022/03/31 17:27:18 naddy Exp $
 .\"	$NetBSD: usbhid.3,v 1.5 2002/02/07 07:00:52 ross Exp $
 .\"
 .\" Copyright (c) 1999, 2001 Lennart Augustsson <augustss@netbsd.org>
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 30 2021 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt USBHID 3
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@ Alternatively a data buffer containing the report descriptor can be passed into
 .Fn hid_use_report_desc .
 The data is copied into an internal structure which can be accessed with
 .Fn hid_get_report_desc_data .
-When the report descriptor is no longer needed it should be freed by calling
+When the report descriptor is no longer needed, it should be freed by calling
 .Fn hid_dispose_report_desc .
 The type
 .Fa report_desc_t
@@ -146,7 +146,7 @@ function should be called to free internal data structures.
 To iterate through all the items in the report descriptor,
 .Fn hid_get_item
 should be called while it returns a value greater than 0.
-When the report descriptor ends it will return 0; a syntax
+When the report descriptor ends, it will return 0; a syntax
 error within the report descriptor will cause a return value less
 than 0.
 The struct pointed to by
@@ -163,7 +163,7 @@ the report.
 The size of a report (of a certain kind) can be computed by the
 .Fn hid_report_size
 function.
-If the report is prefixed by an ID byte it is given by
+If the report is prefixed by an ID byte, it is given by
 .Fa id .
 .Pp
 To locate a single item the
diff --git a/lib/libutil/isduid.3 b/lib/libutil/isduid.3
index 4c5143a5b12..0613c9cb934 100644
--- a/lib/libutil/isduid.3
+++ b/lib/libutil/isduid.3
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: isduid.3,v 1.3 2015/07/15 15:16:59 sobrado Exp $
+.\" 	$OpenBSD: isduid.3,v 1.4 2022/03/31 17:27:18 naddy Exp $
 .\"
 .\" * Copyright (c) Joel Sing <jsing@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 15 2015 $
+.Dd $Mdocdate: March 31 2022 $
 .Dt ISDUID 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@ are specified using the same flags as used by
 .Xr opendev 3 .
 .Pp
 If the OPENDEV_PART flag is included in
-.Fa dflags
+.Fa dflags ,
 the disklabel UID must consist of a 16-character hexadecimal string.
 Otherwise the disklabel UID must consist of a 16-character hexadecimal string
 followed by a