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;

5 files changed, 15 insertions, 15 deletions

diff --git a/share/man/man4/trunk.4 b/share/man/man4/trunk.4
index b1d56ec1f17..e50cca4093f 100644
--- a/share/man/man4/trunk.4
+++ b/share/man/man4/trunk.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trunk.4,v 1.28 2013/07/16 16:05:49 schwarze Exp $
+.\"	$OpenBSD: trunk.4,v 1.29 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 2005, 2006 Reyk Floeter <reyk@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 16 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt TRUNK 4
 .Os
 .Sh NAME
@@ -78,7 +78,7 @@ This protocol requires a switch which supports LACP.
 Distributes outgoing traffic through all active ports
 and accepts incoming traffic from any active port.
 A hash of the protocol header is used to maintain packet ordering.
-The hash includes the Ethernet source and destination address, and, if
+The hash includes the Ethernet source and destination address and, if
 available, the VLAN tag, and the IP source and destination address.
 .It Ic none
 This protocol is intended to do nothing: it disables any traffic without
diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5
index ef5e3096c99..1e9db145502 100644
--- a/share/man/man5/ar.5
+++ b/share/man/man5/ar.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.5,v 1.2 2014/11/15 14:41:02 bentley Exp $
+.\"	$OpenBSD: ar.5,v 1.3 2015/03/13 19:58:41 jmc Exp $
 .\"	$NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ar.5.5	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: November 15 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt AR 5
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ begins with the magic string
 .Dq !<arch>\en .
 The rest of the archive is made up of objects, each of which is composed
 of a header for a file, a possible file name, and the file contents.
-The header is portable between machine architectures, and, if the file
+The header is portable between machine architectures and, if the file
 contents are printable, the archive is itself printable.
 .Pp
 The header is made up of six variable length
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 848c529a5e1..5b44b56789a 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.133 2015/02/23 13:30:02 schwarze Exp $
+.\"	$OpenBSD: mdoc.7,v 1.134 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013 Ingo Schwarze <schwarze@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: February 23 2015 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -2113,7 +2113,7 @@ It is suggested to leave it unspecified, in which case
 .Xr mandoc 1
 uses its
 .Fl Ios
-argument, or, if that isn't specified either,
+argument or, if that isn't specified either,
 .Fa sysname
 and
 .Fa release
diff --git a/share/man/man7/mirroring-ports.7 b/share/man/man7/mirroring-ports.7
index b48cb519bc7..30687e92ba6 100644
--- a/share/man/man7/mirroring-ports.7
+++ b/share/man/man7/mirroring-ports.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mirroring-ports.7,v 1.26 2013/01/10 22:52:28 rpe Exp $
+.\" $OpenBSD: mirroring-ports.7,v 1.27 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 2000,2012 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 10 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt MIRRORING-PORTS 7
 .Os
 .Sh NAME
@@ -119,7 +119,7 @@ Project.
 Some software distributors change distribution files without
 warning, without changing the file name proper.
 Once the problem has been identified, the port maintainer should usually
-contact the software author to fix the problem, or, if the software author
+contact the software author to fix the problem or, if the software author
 is unresponsive, the maintainer should use
 .Ev DIST_SUBDIR
 to provide some state to guard against shifting checksums.
diff --git a/share/man/man8/genassym.sh.8 b/share/man/man8/genassym.sh.8
index fbd31ab84ae..ab34b0e09d9 100644
--- a/share/man/man8/genassym.sh.8
+++ b/share/man/man8/genassym.sh.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: genassym.sh.8,v 1.8 2014/07/05 07:18:33 jsg Exp $
+.\"	$OpenBSD: genassym.sh.8,v 1.9 2015/03/13 19:58:41 jmc Exp $
 .\"	$NetBSD: genassym.sh.8,v 1.5 1999/03/17 20:31:19 garbled Exp $
 .\"
 .\" Copyright (c) 1997 Matthias Pfaller.
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 5 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt GENASSYM.SH 8
 .Os
 .Sh NAME
@@ -81,7 +81,7 @@ In both cases the assym.h file is written to stdout.
 .Sh DIAGNOSTICS
 Either self-explanatory, or generated by one of the programs
 called from the script.
-The script will exit with the return code from the compiler, or, in the
+The script will exit with the return code from the compiler or, in the
 .Fl c
 case, with the return code from the generated executable.
 .Sh SEE ALSO