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, 16 insertions, 16 deletions

diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 9eed64c783c..65cd4ace86a 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fts.3,v 1.32 2015/02/05 02:33:09 schwarze Exp $
+.\"	$OpenBSD: fts.3,v 1.33 2015/03/13 19:58:40 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\"
-.Dd $Mdocdate: February 5 2015 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt FTS 3
 .Os
 .Sh NAME
@@ -558,8 +558,8 @@ structures returned by
 .Fn fts_read
 may be overwritten after a call to
 .Fn fts_close
-on the same file hierarchy stream, or, after a call to
-.Fn fts_read
+on the same file hierarchy stream or, after a call to
+.Fn fts_read ,
 on the same file hierarchy stream unless they represent a file of type
 directory, in which case they will not be overwritten until after a call to
 .Fn fts_read
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index 5ab16623dcd..d084a8838e8 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fflush.3,v 1.10 2013/07/18 10:14:49 schwarze Exp $
+.\"	$OpenBSD: fflush.3,v 1.11 2015/03/13 19:58:40 jmc 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: July 18 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt FFLUSH 3
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@ is set to indicate the error.
 .Bl -tag -width Er
 .It Bq Er EBADF
 .Fa stream
-is not an open stream, or, in the case of
+is not an open stream or, in the case of
 .Fn fflush ,
 not a stream open for writing.
 .El
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index dc429723250..2ca4ced63d1 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msync.2,v 1.23 2014/07/02 22:22:35 matthew Exp $
+.\"	$OpenBSD: msync.2,v 1.24 2015/03/13 19:58:40 jmc Exp $
 .\"	$NetBSD: msync.2,v 1.8 1995/10/12 15:41:09 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)msync.2	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 2 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt MSYNC 2
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@ The
 system call writes all pages with shared modifications
 in the specified
 region of the process's address space back to permanent
-storage, and, if requested, invalidates cached data mapped
+storage and, if requested, invalidates cached data mapped
 in the region.
 If
 .Fa len
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index c7a2e739859..6b7643d06d8 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editline.3,v 1.36 2014/12/15 22:35:41 schwarze Exp $
+.\"	$OpenBSD: editline.3,v 1.37 2015/03/13 19:58:40 jmc Exp $
 .\"	$NetBSD: editline.3,v 1.82 2014/05/11 09:01:42 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: December 15 2014 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt EDITLINE 3
 .Os
 .Sh NAME
@@ -714,7 +714,7 @@ to the last new element of the history.
 .It Dv H_ENTER , Fa "const char *str"
 Add
 .Fa str
-as a new element to the history, and, if necessary,
+as a new element to the history and, if necessary,
 removing the oldest entry to keep the list to the created size.
 If
 .Dv H_SETUNIQUE
diff --git a/lib/libpthread/man/pthread_cleanup_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index 5a67cd937c3..815a58d9f68 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_cleanup_pop.3,v 1.9 2013/06/05 03:44:50 tedu Exp $
+.\" $OpenBSD: pthread_cleanup_pop.3,v 1.10 2015/03/13 19:58:41 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Brian Cully <shmit@kublai.com>
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD: pthread_cleanup_pop.3,v 1.4 1999/08/28 00:03:02 peter Exp $
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: March 13 2015 $
 .Dt PTHREAD_CLEANUP_POP 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 The
 .Fn pthread_cleanup_pop
 function pops the top cleanup routine off of the current thread's cleanup
-routine stack, and, if
+routine stack and, if
 .Fa execute
 is non-zero, it will execute the function.
 If there is no cleanup routine then