Don't use use .Tn with AND/OR/NOT

Phrase any "The _flags_ argument is the ..." line consistently,
eliminating unnecessary use of 'inclusive' and saying "zero or more"
or "one or more" as appropriate

ok millert@ jmc@ schwarze@

14 files changed, 55 insertions, 94 deletions

diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index baf3df6f6a1..e17aad86d66 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: access.2,v 1.22 2013/04/01 20:16:31 guenther Exp $
+.\"	$OpenBSD: access.2,v 1.23 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: access.2,v 1.7 1995/02/27 12:31:44 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
 .\"
-.Dd $Mdocdate: April 1 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt ACCESS 2
 .Os
 .Sh NAME
@@ -52,11 +52,10 @@ function checks the accessibility of the file named by
 .Fa path
 for the access permissions indicated by
 .Fa amode .
-The value of
+The
 .Fa amode
-is the bitwise inclusive
-.Tn OR
-of the access permissions to be checked
+argument is either the bitwise OR of one or more of the access permissions
+to be checked
 .Pf ( Dv R_OK
 for read permission,
 .Dv W_OK
@@ -115,12 +114,9 @@ If
 is also zero, the behavior is identical to a call to
 .Fn access .
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_EACCESS -offset indent -compact
 .It Dv AT_EACCESS
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index dcba47128ee..7c49f968062 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.2,v 1.22 2009/08/20 18:32:58 martynas Exp $
+.\"	$OpenBSD: chflags.2,v 1.23 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: chflags.2,v 1.6 1995/02/27 12:32:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)chflags.2	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: August 20 2009 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt CHFLAGS 2
 .Os
 .Sh NAME
@@ -52,9 +52,7 @@ or referenced by the descriptor
 has its flags changed to
 .Fa flags .
 .Pp
-The flags specified are formed by
-.Tn OR Ns 'ing
-the following values:
+The flags are the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width "SF_IMMUTABLE" -compact -offset indent
 .It Dv UF_NODUMP
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index 9c5c10b9946..7aadd8ecfcd 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.2,v 1.24 2014/01/11 19:23:39 espie Exp $
+.\"	$OpenBSD: chmod.2,v 1.25 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: chmod.2,v 1.7 1995/02/27 12:32:06 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 11 2014 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt CHMOD 2
 .Os
 .Sh NAME
@@ -59,12 +59,10 @@ to
 verifies that the process owner (user) either owns the specified file
 or is the superuser.
 .Pp
-Values for
+The
 .Fa mode
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-permission bit masks from the following list defined in
-.In sys/stat.h :
+argument is the bitwise OR of zero or more of the permission bit masks
+from the following list:
 .Bd -literal -offset indent
 #define S_IRWXU 0000700    /* RWX mask for owner */
 #define S_IRUSR 0000400    /* R for owner */
@@ -135,12 +133,9 @@ If
 is also zero, the behavior is identical to a call to
 .Fn chmod .
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_SYMLINK_NOFOLLOW -offset indent -compact
 .It Dv AT_SYMLINK_NOFOLLOW
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 9aeec9d5000..00d0416379d 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.2,v 1.22 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: chown.2,v 1.23 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: chown.2,v 1.10 1995/10/12 15:40:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt CHOWN 2
 .Os
 .Sh NAME
@@ -117,12 +117,9 @@ depending on whether or not the
 bit is set in
 .Fa flag .
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_SYMLINK_NOFOLLOW -offset indent -compact
 .It Dv AT_SYMLINK_NOFOLLOW
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index ce8d0f64e77..1a7ce4fe873 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link.2,v 1.24 2013/04/01 20:16:31 guenther Exp $
+.\"	$OpenBSD: link.2,v 1.25 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: link.2,v 1.7 1995/02/27 12:34:01 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
 .\"
-.Dd $Mdocdate: April 1 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt LINK 2
 .Os
 .Sh NAME
@@ -106,12 +106,9 @@ or
 .Fa name2
 argument.
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_SYMLINK_FOLLOW -offset indent -compact
 .It Dv AT_SYMLINK_FOLLOW
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index ba41a16bd21..447c29bac1e 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mprotect.2,v 1.16 2013/03/31 08:28:21 guenther Exp $
+.\"	$OpenBSD: mprotect.2,v 1.17 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: mprotect.2,v 1.6 1995/10/12 15:41:08 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt MPROTECT 2
 .Os
 .Sh NAME
@@ -62,9 +62,7 @@ The protections (region accessibility) are specified in the
 argument.
 It should either be
 .Dv PROT_NONE
-or a bitwise-inclusive
-.Tn OR
-of one or more of the following values:
+or the bitwise OR of one or more of the following values:
 .Pp
 .Bl -tag -width "PROT_WRITEXX" -offset indent -compact
 .It Dv PROT_EXEC
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 6f8c0ceec74..a45d90e2c0a 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msync.2,v 1.21 2007/05/31 19:19:33 jmc Exp $
+.\"	$OpenBSD: msync.2,v 1.22 2014/02/13 07:30:39 guenther 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: May 31 2007 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt MSYNC 2
 .Os
 .Sh NAME
@@ -69,9 +69,7 @@ are unpredictable except after an
 .Pp
 The
 .Fa flags
-argument is formed by
-.Tn OR Ns 'ing
-the following values:
+argument is the bitwise OR of zero or more of the following values:
 .Bd -literal -offset indent
 MS_ASYNC	Perform asynchronous writes.
 MS_SYNC		Perform synchronous writes.
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index d122e315ed4..ed1accb0597 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: open.2,v 1.45 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: open.2,v 1.46 2014/02/13 07:30:39 guenther 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: July 17 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt OPEN 2
 .Os
 .Sh NAME
@@ -64,10 +64,7 @@ as described in
 and modified by the process' umask value (see
 .Xr umask 2 ) .
 .Pp
-The flags specified are formed by bitwise-inclusive
-.Tn OR Ns 'ing
-the following values defined in
-.In fcntl.h .
+The flags specified are a bitwise OR of the following values.
 Exactly one of the first three values (file access modes) must be specified:
 .Pp
 .Bl -tag -width O_DIRECTORY -offset indent -compact
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 0028a511ab3..6b8f6b2d7dd 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recv.2,v 1.39 2014/01/22 22:54:14 guenther Exp $
+.\"	$OpenBSD: recv.2,v 1.40 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: recv.2,v 1.6 1995/02/27 12:36:08 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
 .\"
-.Dd $Mdocdate: January 22 2014 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt RECV 2
 .Os
 .Sh NAME
@@ -114,9 +114,7 @@ system calls may be used to determine when more data arrive.
 .Pp
 The
 .Fa flags
-argument is the bitwise
-.Tn OR
-of zero or more of the following values:
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width "MSG_DONTWAITXX" -offset indent -compact
 .It Dv MSG_OOB
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index 8db38ac0561..3130546aab6 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semget.2,v 1.17 2007/05/31 19:19:33 jmc Exp $
+.\"	$OpenBSD: semget.2,v 1.18 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: semget.2,v 1.2 1997/03/27 08:20:41 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -30,7 +30,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: May 31 2007 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt SEMGET 2
 .Os
 .Sh NAME
@@ -63,9 +63,7 @@ bit is set in
 .Pp
 The access modes of the created semaphores is specified in
 .Fa semflg
-by
-.Tn OR Ns 'ing
-the following values:
+as a bitwise OR of zero or more of the following values:
 .Bd -literal -offset indent
 SEM_A        alter permission for owner
 SEM_R        read permission for owner
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 48c537cb34f..bdbb2576d05 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.39 2013/11/02 21:36:50 guenther Exp $
+.\"	$OpenBSD: stat.2,v 1.40 2014/02/13 07:30:39 guenther Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)stat.2	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: November 2 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -102,12 +102,9 @@ depending on whether or not the
 bit is set in
 .Fa flag .
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_SYMLINK_NOFOLLOW -offset indent -compact
 .It Dv AT_SYMLINK_NOFOLLOW
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index d1bedb8e598..1cd393f2e6e 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unlink.2,v 1.22 2013/04/01 20:16:31 guenther Exp $
+.\"	$OpenBSD: unlink.2,v 1.23 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: unlink.2,v 1.7 1995/02/27 12:39:13 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: April 1 2013 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt UNLINK 2
 .Os
 .Sh NAME
@@ -94,12 +94,9 @@ depending on whether or not the
 bit is set in
 .Fa flag .
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_REMOVEDIR -offset indent -compact
 .It Dv AT_REMOVEDIR
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 454e4c29258..90a15ad80e7 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utimes.2,v 1.20 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: utimes.2,v 1.21 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: utimes.2,v 1.9 1996/04/23 10:34:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt UTIMES 2
 .Os
 .Sh NAME
@@ -126,12 +126,9 @@ in the
 .Fa fd
 parameter, the current working directory is used.
 .Pp
-Values for
+The
 .Fa flag
-are constructed by bitwise-inclusive
-.Tn OR Ns ing
-flags from the following list defined in
-.In fcntl.h :
+argument is the bitwise OR of zero or more of the following values:
 .Pp
 .Bl -tag -width AT_SYMLINK_NOFOLLOW -offset indent -compact
 .It Dv AT_SYMLINK_NOFOLLOW
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index d6cd436e645..b18db3b0d9c 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wait.2,v 1.25 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: wait.2,v 1.26 2014/02/13 07:30:39 guenther Exp $
 .\"	$NetBSD: wait.2,v 1.6 1995/02/27 12:39:37 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: February 13 2014 $
 .Dt WAIT 2
 .Os
 .Sh NAME
@@ -109,9 +109,7 @@ The
 parameter is defined below.
 The
 .Fa options
-parameter contains the bitwise
-.Tn OR
-of any of the following options:
+argument is the bitwise OR of zero or more of the following values:
 .Bl -tag -width "WCONTINUED"
 .It Dv WCONTINUED
 Causes status to be reported for stopped child processes that have been