remove the first comma from constructs like ", and," and ", or,": you can use

"and" and "or" to join sentence clauses, and you can use commas, but both hinders
reading;

8 files changed, 30 insertions, 30 deletions

diff --git a/usr.sbin/dhcpd/dhcpd.8 b/usr.sbin/dhcpd/dhcpd.8
index ed6280a848d..fba614ce584 100644
--- a/usr.sbin/dhcpd/dhcpd.8
+++ b/usr.sbin/dhcpd/dhcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.8,v 1.26 2014/11/22 18:15:41 deraadt Exp $
+.\"	$OpenBSD: dhcpd.8,v 1.27 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: November 22 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt DHCPD 8
 .Os
 .Sh NAME
@@ -383,7 +383,7 @@ to configure its network interface (e.g., subnet mask), and also how
 the client can access various network services (e.g., DNS, IP routers,
 and so on).
 .Pp
-These options can be specified on a per-subnet basis, and, for BOOTP
+These options can be specified on a per-subnet basis and, for BOOTP
 clients, also on a per-client basis.
 In the event that a BOOTP client declaration specifies options that are
 also specified in its subnet declaration, the options specified in the
diff --git a/usr.sbin/dhcpd/dhcpd.conf.5 b/usr.sbin/dhcpd/dhcpd.conf.5
index bdd81d4816e..a1f3c593f1b 100644
--- a/usr.sbin/dhcpd/dhcpd.conf.5
+++ b/usr.sbin/dhcpd/dhcpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.conf.5,v 1.15 2014/01/03 16:21:58 jmc Exp $
+.\"	$OpenBSD: dhcpd.conf.5,v 1.16 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998, 1998, 1999
 .\" The Internet Software Consortium.    All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: January 3 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt DHCPD.CONF 5
 .Os
 .Sh NAME
@@ -472,7 +472,7 @@ declarations are matched to actual DHCP or BOOTP clients by matching the
 .Ic dhcp-client-identifier
 option specified in the
 .Ic host
-declaration to the one supplied by the client, or, if the
+declaration to the one supplied by the client or, if the
 .Ic host
 declaration or the client does not provide a
 .Ic dhcp-client-identifier
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index c94bc931eb4..d4b3ef1587f 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mtree.8,v 1.37 2014/01/10 20:20:34 jmc Exp $
+.\"	$OpenBSD: mtree.8,v 1.38 2015/03/13 19:58:41 jmc Exp $
 .\"	$NetBSD: mtree.8,v 1.4 1995/03/07 21:26:25 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mtree.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: January 10 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt MTREE 8
 .Os
 .Sh NAME
@@ -309,7 +309,7 @@ that
 .Fl cK
 .Cm sha256digest
 be run on the file systems, and a copy of the results stored on a different
-machine, or, at least, in encrypted form.
+machine or, at least, in encrypted form.
 The output file itself should be digested using the
 .Xr sha256 1
 utility.
diff --git a/usr.sbin/procmap/procmap.1 b/usr.sbin/procmap/procmap.1
index 9223a3132aa..34fca120310 100644
--- a/usr.sbin/procmap/procmap.1
+++ b/usr.sbin/procmap/procmap.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: procmap.1,v 1.19 2014/11/16 12:31:01 deraadt Exp $
+.\"	$OpenBSD: procmap.1,v 1.20 2015/03/13 19:58:41 jmc Exp $
 .\"	$NetBSD: pmap.1,v 1.6 2003/01/19 21:25:43 atatat Exp $
 .\"
 .\" Copyright (c) 2002 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: November 16 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt PROCMAP 1
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@ The
 .Nm
 utility lists the virtual memory mappings underlying the given
 process.
-The start address of each entry is always given, and,
+The start address of each entry is always given and,
 depending on the options given, other information such as the end
 address, the underlying file's device and inode numbers, and various
 protection information will be displayed, along with the path to the
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 9df1c3f574d..49ab022fafa 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.31 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: useradd.8,v 1.32 2015/03/13 19:58:41 jmc Exp $
 .\" $NetBSD: useradd.8,v 1.26 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt USERADD 8
 .Os
 .Sh NAME
@@ -167,7 +167,7 @@ option be specified.
 .It Fl c Ar comment
 Sets the comment field (also, for historical reasons known as the
 GECOS field) which will be added for the user, and typically will include
-the user's full name, and, perhaps, contact information for the user.
+the user's full name and, perhaps, contact information for the user.
 .It Fl d Ar home-directory
 Sets the home directory which will be created and populated for the user,
 should the
@@ -240,8 +240,8 @@ Once the information has been verified,
 uses
 .Xr pwd_mkdb 8
 to update the user database.
-This is run in the background, and,
-at very large sites could take several minutes.
+This is run in the background and,
+at very large sites, could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
 .Sh FILES
diff --git a/usr.sbin/user/userdel.8 b/usr.sbin/user/userdel.8
index 8bc00410dfd..7062a6784b8 100644
--- a/usr.sbin/user/userdel.8
+++ b/usr.sbin/user/userdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: userdel.8,v 1.16 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: userdel.8,v 1.17 2015/03/13 19:58:41 jmc Exp $
 .\" $NetBSD: userdel.8,v 1.24 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt USERDEL 8
 .Os
 .Sh NAME
@@ -118,8 +118,8 @@ Once the information has been verified,
 uses
 .Xr pwd_mkdb 8
 to update the user database.
-This is run in the background, and,
-at very large sites could take several minutes.
+This is run in the background and,
+at very large sites, could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
 .Sh FILES
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 76f9395407d..4ccdb9c6eb8 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.30 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: usermod.8,v 1.31 2015/03/13 19:58:41 jmc Exp $
 .\" $NetBSD: usermod.8,v 1.17 2003/02/14 16:11:37 grant Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt USERMOD 8
 .Os
 .Sh NAME
@@ -72,7 +72,7 @@ the following command line options are processed:
 .It Fl c Ar comment
 Sets the comment field (also, for historical reasons known as the
 GECOS field) which will be added for the user, and typically will include
-the user's full name, and, perhaps, contact information for the user.
+the user's full name and, perhaps, contact information for the user.
 .It Fl d Ar home-directory
 Sets the home directory to
 .Ar home-directory
@@ -240,8 +240,8 @@ Once the information has been verified,
 uses
 .Xr pwd_mkdb 8
 to update the user database.
-This is run in the background, and,
-at very large sites could take several minutes.
+This is run in the background and,
+at very large sites, could take several minutes.
 Until this update is completed, the password file is unavailable for other
 updates and the new information is not available to programs.
 .Sh FILES
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index fdba8b4b6fa..6a62d03370b 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vipw.8,v 1.11 2007/11/19 22:07:37 jmc Exp $
+.\"	$OpenBSD: vipw.8,v 1.12 2015/03/13 19:58:41 jmc Exp $
 .\"	$NetBSD: vipw.8,v 1.4 1995/01/20 19:19:56 mycroft Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: November 19 2007 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt VIPW 8
 .Os
 .Sh NAME
@@ -67,8 +67,8 @@ Once the information has been verified,
 uses
 .Xr pwd_mkdb 8
 to update the user database.
-This is run in the background, and,
-at very large sites could take several minutes.
+This is run in the background and,
+at very large sites, could take several minutes.
 Until this update
 is completed, the password file is unavailable for other updates
 and the new information is not available to programs.