- use a consistent text for STANDARDS

- note which options are extensions to POSIX

55 files changed, 392 insertions, 229 deletions

diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 545ebfa8802..58cf3a7bc6b 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: asa.1,v 1.12 2005/12/06 12:37:51 jmc Exp $
+.\"	$OpenBSD: asa.1,v 1.13 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: asa.1,v 1.4 1995/03/26 02:25:05 glass Exp $
 .\"
 .\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -95,8 +95,10 @@ program and redirect it to a line-printer.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 The
 .Nm fpr
 utility is deprecated and its use should be restricted.
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 32f78f4c78a..3bbc4ad8ae2 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.34 2007/03/26 13:55:42 jmc Exp $
+.\" $OpenBSD: at.1,v 1.35 2007/05/30 04:41:33 jmc Exp $
 .\"
 .\" Copyright (C) 1993, 1994  Thomas Koenig
 .\" Copyright (C) 1993  David Parsons
@@ -315,6 +315,24 @@ deny permission control
 .Xr umask 2 ,
 .Xr cron 8 ,
 .Xr sendmail 8
+.Sh STANDARDS
+The
+.Nm
+and
+.Nm batch
+utilities are compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The
+.Nm
+flags
+.Op Fl bc
+and the
+.Nm batch
+flags
+.Op Fl fmq
+are extensions to that specification.
 .Sh AUTHORS
 .An -nosplit
 .Nm at
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index eafc4c1001e..30235626426 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.25 2007/01/29 19:41:10 jmc Exp $
+.\"	$OpenBSD: awk.1,v 1.26 2007/05/30 04:41:33 jmc Exp $
 .\" EX/EE is a Bd
 .\"
 .\" Copyright (C) Lucent Technologies 1997
@@ -745,6 +745,20 @@ Print an error message to standard error:
 .%D 1988
 .%O ISBN 0-201-07981-X
 .Re
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl \&dV
+and
+.Op Fl safe ,
+as well as the command
+.Cm fflush ,
+are extensions to that specification.
 .Sh HISTORY
 An
 .Nm
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 15176b6164e..06de2ca767c 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: basename.1,v 1.12 2003/06/03 02:56:06 millert Exp $
+.\"	$OpenBSD: basename.1,v 1.13 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -74,5 +74,6 @@ to
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/bc/bc.1 b/usr.bin/bc/bc.1
index 68d9c5f8232..59f93528654 100644
--- a/usr.bin/bc/bc.1
+++ b/usr.bin/bc/bc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bc.1,v 1.20 2005/10/29 08:27:25 jmc Exp $
+.\"	$OpenBSD: bc.1,v 1.21 2007/05/30 04:41:33 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -351,9 +351,13 @@ option is specified on the command line.
 .Sh STANDARDS
 The
 .Nm
-utility is expected to conform to the
-.St -p1003.2
+utility is compliant with the
+.St -p1003.1-2004
 specification.
+.Pp
+The flags
+.Op Fl ce
+are extensions to that specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index c3f05b9eb09..14580434c4f 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cal.1,v 1.15 2005/12/07 16:50:51 tom Exp $
+.\"	$OpenBSD: cal.1,v 1.16 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -91,9 +91,13 @@ calendar for that month is a bit unusual.
 .Sh STANDARDS
 The
 .Nm
-command offers a superset of
-.St -p1003.2
-functionality.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl jy
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index bdd650869b4..2369f7efdc4 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: cmp.1,v 1.11 2006/12/20 15:32:10 jasper Exp $
+.\"     $OpenBSD: cmp.1,v 1.12 2007/05/30 04:41:33 jmc Exp $
 .\"     $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -109,9 +109,15 @@ An error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be
-.St -p1003.2
-compatible.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The arguments
+.Ar skip1
+and
+.Ar skip2
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 62abd08a750..69d43bc88a5 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compress.1,v 1.37 2007/04/04 16:25:03 jmc Exp $
+.\"	$OpenBSD: compress.1,v 1.38 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
 .\"
 .\" Copyright (c) 1986, 1990, 1993
@@ -334,10 +334,26 @@ or 2 if a warning occurred.
 .Re
 .Sh STANDARDS
 The
-.Nm
-utility is compliant with the
-.St -p1003.2-92
+.Nm ,
+.Nm uncompress ,
+and
+.Nm zcat
+utilities are compliant with the
+.St -p1003.1-2004
 specification.
+.Pp
+The
+.Nm
+flags
+.Op Fl 123456789dghLlNnOqrtV ,
+.Nm uncompress
+flags
+.Op Fl hlNnqrt ,
+and the
+.Nm zcat
+flags
+.Op Fl fghqr
+are extensions to that specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/csplit/csplit.1 b/usr.bin/csplit/csplit.1
index d533bc2e9ac..dc9a492dc75 100644
--- a/usr.bin/csplit/csplit.1
+++ b/usr.bin/csplit/csplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csplit.1,v 1.2 2006/07/17 20:09:34 jmc Exp $
+.\"	$OpenBSD: csplit.1,v 1.3 2007/05/30 04:41:33 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Tim J. Robbins.
 .\" All rights reserved.
@@ -149,8 +149,9 @@ Split standard input after the first 99 lines and every 100 lines thereafter:
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.1-2004 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 07fd91fd73d..b694d5d88f7 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctags.1,v 1.14 2007/03/15 22:41:17 jmc Exp $
+.\"	$OpenBSD: ctags.1,v 1.15 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -182,6 +182,16 @@ Duplicate objects are not considered errors.
 .Sh SEE ALSO
 .Xr ex 1 ,
 .Xr vi 1
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl BdFtuvw
+are extensions to that specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 95cf0b03dca..e7e5ca0ae3b 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cut.1,v 1.10 2007/03/15 22:38:24 jmc Exp $
+.\"	$OpenBSD: cut.1,v 1.11 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -129,5 +129,6 @@ Show the names and login times of logged in users:
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 39f27b73d98..f577a476cea 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.31 2007/03/01 21:48:32 jmc Exp $
+.\" $OpenBSD: diff.1,v 1.32 2007/05/30 04:41:33 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -476,9 +476,13 @@ An error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be a superset of the
-.St -p1003.1-2001
+utility is compliant with the
+.St -p1003.1-2004
 specification.
+.Pp
+The flags
+.Op Fl aDdIiLlNnPpqSsTtUuwXx
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/dirname/dirname.1 b/usr.bin/dirname/dirname.1
index 0eb24475964..25342afa99d 100644
--- a/usr.bin/dirname/dirname.1
+++ b/usr.bin/dirname/dirname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dirname.1,v 1.3 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: dirname.1,v 1.4 2007/05/30 04:41:33 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -69,5 +69,6 @@ to
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index fea61dc0c08..21f9f1e19e3 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: du.1,v 1.19 2005/04/17 12:27:23 jmc Exp $
+.\"	$OpenBSD: du.1,v 1.20 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -137,6 +137,16 @@ option is specified.
 .Xr fts 3 ,
 .Xr symlink 7 ,
 .Xr quot 8
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl chrP
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index c850fcf6508..cfe02690106 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: env.1,v 1.14 2007/05/20 23:15:57 jmc Exp $
+.\"	$OpenBSD: env.1,v 1.15 2007/05/30 04:41:33 jmc Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -108,14 +108,15 @@ could not be found.
 .Xr execvp 3 ,
 .Xr environ 7
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 The historic
 .Fl
 option has been deprecated but is still supported in this implementation.
-.Pp
-The
-.Nm
-utility conforms to
-.St -p1003.2-92 .
 .Sh BUGS
 .Nm
 doesn't handle commands with equal
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index e8cf60ee968..bad2c9c6b16 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: expand.1,v 1.11 2006/10/16 15:52:11 jmc Exp $
+.\"	$OpenBSD: expand.1,v 1.12 2007/05/30 04:41:33 jmc Exp $
 .\"	$NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -119,7 +119,8 @@ and
 .Nm unexpand
 utilities are compliant with the
 .St -p1003.1-2004
-specification, with the following exceptions:
+specification,
+with the following exceptions:
 .Bl -bullet -offset indent
 .It
 .Tn POSIX
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 6512e264b79..eeb54ee0b3c 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: false.1,v 1.5 2003/06/03 02:56:08 millert Exp $
+.\"	$OpenBSD: false.1,v 1.6 2007/05/30 04:41:34 jmc Exp $
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -50,5 +50,6 @@ utility always exits with a non-zero exit code.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 78717b3eb31..18a9364486b 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.67 2006/10/11 19:19:37 jmc Exp $
+.\"	$OpenBSD: find.1,v 1.68 2007/05/30 04:41:34 jmc Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -553,9 +553,9 @@ or
 .Sh STANDARDS
 The
 .Nm
-utility syntax is a superset of the syntax specified by the
+utility is compliant with the
 .St -p1003.1-2004
-standard.
+specification.
 .Pp
 The options
 .Op Fl dfhXx
@@ -578,8 +578,7 @@ and primaries
 .Ic -path ,
 and
 .Ic -print0
-are extensions to
-.St -p1003.1-2004 .
+are extensions to that specification.
 The
 .Ic -iname
 primary was inspired by GNU find.
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 15b9a08280b..cd7915519e8 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fold.1,v 1.10 2006/12/16 08:56:35 jmc Exp $
+.\"	$OpenBSD: fold.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
@@ -67,8 +67,9 @@ Specifies a line width to use instead of the default 80 characters.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh BUGS
 If underlining (see
 .Xr ul 1 )
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 39a500ae7b3..844dbc6ce2c 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getconf.1,v 1.6 2000/03/07 21:11:09 aaron Exp $
+.\"	$OpenBSD: getconf.1,v 1.7 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -67,5 +67,6 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/grep/grep.1 b/usr.bin/grep/grep.1
index 385a30643e2..52ca1dc900e 100644
--- a/usr.bin/grep/grep.1
+++ b/usr.bin/grep/grep.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grep.1,v 1.33 2007/02/13 21:48:20 kili Exp $
+.\"	$OpenBSD: grep.1,v 1.34 2007/05/30 04:41:34 jmc Exp $
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -361,7 +361,7 @@ looking for either 19, 20, or 25.
 .Xr re_format 7
 .Sh STANDARDS
 The
-.Nm grep
+.Nm
 utility is compliant with the
 .St -p1003.1-2004
 specification.
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 3215e2bb05f..d73d475f0a0 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: head.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
+.\"	$OpenBSD: head.1,v 1.13 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -94,12 +94,13 @@ in the following way to, for example, display only line 500 from the file
 .Xr more 1 ,
 .Xr tail 1
 .Sh STANDARDS
-The historic command line syntax is supported by this implementation.
-.Pp
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The historic command line syntax is supported by this implementation.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 845d14b82a0..500a6ee7b23 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: id.1,v 1.12 2004/11/16 13:51:35 jmc Exp $
+.\"	$OpenBSD: id.1,v 1.13 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
 .\"
 .\" Copyright (c) 1991, 1993, 1994
@@ -123,8 +123,13 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
-function is expected to conform to
-.St -p1003.2 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flag
+.Op Fl p
+is an extension to that specification.
 .Sh HISTORY
 The
 historic
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 8561a839eb6..946b567c1a3 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: join.1,v 1.18 2007/05/29 18:29:26 jmc Exp $
+.\"	$OpenBSD: join.1,v 1.19 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -175,9 +175,9 @@ may be specified at the same time.
 .Sh STANDARDS
 The
 .Nm
-command is expected to be
-.St -p1003.2
-compatible.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Pp
 In the absence of the
 .Fl o
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 8962e72e1f5..d13fd5ebd19 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: logger.1,v 1.13 2007/03/15 23:12:12 jmc Exp $
+.\"	$OpenBSD: logger.1,v 1.14 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: logger.1,v 1.4 1994/12/22 06:26:59 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -95,6 +95,11 @@ $ logger -p local0.notice -t HOSTIDM -f /dev/idmc
 .Xr syslogd 8
 .Sh STANDARDS
 The
-.Nm logger
-utility conforms to
-.St -p1003.2-92 .
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl ifpst
+are extensions to that specification.
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 300d89a9b19..c45bdfcb462 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: logname.1,v 1.9 2003/06/03 02:56:10 millert Exp $
+.\"	$OpenBSD: logname.1,v 1.10 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -67,8 +67,9 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 5d87750f3e0..f1b05c52722 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.48 2006/12/12 21:16:18 jmc Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.49 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -419,18 +419,29 @@ Returns the current file's line number.
 Returns the current file's name.
 .El
 .Sh STANDARDS
+The
 .Nm
-is expected to be
+utility is compliant with the
 .St -p1003.1-2004
-compliant,
-along with a few extensions taken from
-.Nm gnu-m4 .
+specification.
 .Pp
-Flags
-.Fl I ,
-.Fl d ,
-.Fl t
-are non-standard.
+The flags
+.Op Fl dgIot
+and the macros
+.Ic builtin ,
+.Ic esyscmd ,
+.Ic expr ,
+.Ic format ,
+.Ic indir ,
+.Ic paste ,
+.Ic patsubst ,
+.Ic regexp ,
+.Ic spaste ,
+.Ic unix ,
+.Ic __line__ ,
+and
+.Ic __file__
+are extensions to that specification.
 .Pp
 The output format of tracing and of
 .Ic dumpdef
@@ -455,20 +466,6 @@ In this implementation,
 replaces the top-most definition only.
 Other implementations may erase all definitions on the stack instead.
 .Pp
-For portability, one should not use the macros
-.Ic builtin ,
-.Ic esyscmd ,
-.Ic expr ,
-.Ic format ,
-.Ic indir ,
-.Ic paste ,
-.Ic patsubst ,
-.Ic regexp ,
-.Ic spaste ,
-.Ic unix ,
-.Ic __line__ ,
-.Ic __file__ .
-.Pp
 All built-ins do expand without arguments in many other
 .Nm m4 .
 .Pp
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index dd51dda9924..553c6b36945 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.66 2006/01/12 17:15:59 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.67 2007/05/30 04:41:34 jmc Exp $
 .\"	$OpenPackages$
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
@@ -1286,9 +1286,15 @@ directory
 "Make \(em A Tutorial",
 .Pa /usr/share/doc/psd/12.make/ .
 .Sh STANDARDS
+The
 .Nm
-mostly conforms to the Single Unix Specification, Version 2,
-with some noted extensions and a few problems.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl BDdIjmPV
+are extensions to that specification.
 .Pp
 Older versions of
 .Nm
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index b7966f69619..86a77cf4804 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.1,v 1.33 2007/05/23 20:57:29 jmc Exp $
+.\"	$OpenBSD: man.1,v 1.34 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -316,6 +316,16 @@ default man configuration file
 .Xr mdoc.samples 7 ,
 .Xr intro 8 ,
 .Xr intro 9
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl aCcfhMmSsw
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 5ae95f27ed5..c9d4920132c 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mesg.1,v 1.10 2007/03/15 22:59:02 jmc Exp $
+.\"	$OpenBSD: mesg.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: mesg.1,v 1.3 1994/12/23 07:16:31 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -83,6 +83,12 @@ An error has occurred.
 .Xr biff 1 ,
 .Xr talk 1 ,
 .Xr write 1
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh HISTORY
 A
 .Nm mesg
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 2732fe7ea94..2488c5d3e7c 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nice.1,v 1.12 2003/06/10 09:12:11 jmc Exp $
+.\"	$OpenBSD: nice.1,v 1.13 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -91,14 +91,15 @@ shall be that of
 .Xr setpriority 2 ,
 .Xr renice 8
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 The historic
 .Fl Ns Ar increment
 option has been deprecated but is still supported in this implementation.
-.Pp
-The
-.Nm
-utility conforms to
-.St -p1003.2-92 .
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 602611eddae..c5c1852b0e7 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nohup.1,v 1.10 2005/06/30 20:02:12 jmc Exp $
+.\"	$OpenBSD: nohup.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: nohup.1,v 1.5 1995/08/31 23:35:24 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -111,6 +111,6 @@ User's home directory.
 .Sh STANDARDS
 The
 .Nm
-command is expected to be
-.St -p1003.2
-compatible.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index e17786fb2b2..b1d9348ad2e 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: paste.1,v 1.8 2006/01/04 16:15:05 jmc Exp $
+.\"	$OpenBSD: paste.1,v 1.9 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -141,7 +141,7 @@ environment variable:
 .Xr cut 1
 .Sh STANDARDS
 The
-.Nm paste
-utility is expected to be
-.St -p1003.2
-compatible.
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index e0fa0f43af1..62d2950b2ea 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pr.1,v 1.16 2007/03/03 23:16:02 jmc Exp $
+.\"	$OpenBSD: pr.1,v 1.17 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 1993
@@ -402,10 +402,13 @@ use of these characters will cause formatting errors.
 .Xr ascii 7
 .Sh STANDARDS
 The
-.Nm pr
-utility is
-.St -p1003.2
-compatible; however, that standard is relatively silent concerning the
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+.St -p1003.1-2004
+is relatively silent concerning the
 handling of input characters beyond the behavior dictated by the
 .Nm pr
 required command
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 2a02824a3e8..e7d35526298 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.1,v 1.16 2003/06/03 02:56:14 millert Exp $
+.\"	$OpenBSD: printf.1,v 1.17 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -304,9 +304,10 @@ Print the decimal representation of the character 'a' (see
 .Xr printf 3
 .Sh STANDARDS
 The
-.Nm printf
-utility conforms to
-.St -p1003.2-92 .
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 4012330b73f..a3edc000917 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.26 2007/03/20 06:07:57 ray Exp $
+.\"	$OpenBSD: sed.1,v 1.27 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -519,7 +519,7 @@ specification.
 .Pp
 The flags
 .Op Fl au
-are extensions to the specification.
+are extensions to that specification.
 .Pp
 The use of newlines to separate multiple commands on the command line
 is non-portable;
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1
index f067815e3e7..36c8794c413 100644
--- a/usr.bin/sort/sort.1
+++ b/usr.bin/sort/sort.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sort.1,v 1.27 2005/10/28 23:18:17 dlg Exp $
+.\"	$OpenBSD: sort.1,v 1.28 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -375,13 +375,13 @@ already exists
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be compliant with the
-.St -p1003.1-2001
+utility is compliant with the
+.St -p1003.1-2004
 specification.
 .Pp
 The flags
 .Op Fl HRTz
-are extensions to the specification.
+are extensions to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index a86119c62cb..f74d9ab402c 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: split.1,v 1.14 2007/01/24 21:25:02 jmc Exp $
+.\"	$OpenBSD: split.1,v 1.15 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: split.1,v 1.5 1994/12/21 08:20:35 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
@@ -132,6 +132,10 @@ utility is compliant with the
 .St -p1003.1-2004
 specification.
 .Pp
+The flag
+.Op Fl p
+is an extension to that specification.
+.Pp
 The use of
 .Sq y
 and
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 3a2d5411470..681287e2c39 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strings.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: strings.1,v 1.10 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -93,6 +93,16 @@ is useful for identifying random binaries, among other things.
 .Xr hexdump 1 ,
 .Xr od 1
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl fmo
+are extensions to that specification.
+.Pp
 Historic implementations of
 .Nm
 only search the initialized data portion of the object file.
@@ -100,11 +110,6 @@ This was reasonable as strings were normally stored there.
 Given new compiler technology which installs strings in the
 text portion of the object file, the default behavior was
 changed.
-.Pp
-The
-.Nm
-utility conforms to
-.St -p1003.2-92 .
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index e12b818cb66..23a5b3aab5f 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tail.1,v 1.14 2006/12/28 10:09:19 jmc Exp $
+.\"	$OpenBSD: tail.1,v 1.15 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993
@@ -149,14 +149,13 @@ open, displaying to the standard output anything appended to the file:
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be a superset of the
-.St -p1003.2-92
+utility is compliant with the
+.St -p1003.1-2004
 specification.
-In particular, the
-.Fl b
-and
-.Fl r
-options are extensions to that standard.
+.Pp
+The flags
+.Op Fl br
+are extensions to that specification.
 .Pp
 The historic command line syntax of
 .Nm
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index e0d4a5a48c0..4047a476e6b 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tee.1,v 1.5 2003/06/03 02:56:17 millert Exp $
+.\"	$OpenBSD: tee.1,v 1.6 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: tee.1,v 1.4 1994/12/09 01:43:37 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -81,7 +81,6 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
-function is expected to be
-.Tn POSIX
-.St -p1003.2
-compatible.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index b29bae5a2ee..5c851eda611 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: time.1,v 1.13 2003/06/23 21:46:02 jmc Exp $
+.\"	$OpenBSD: time.1,v 1.14 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -108,8 +108,13 @@ shall be that of
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flag
+.Op Fl l
+is an extension to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index fe03668f7cb..8afa712aa65 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: touch.1,v 1.11 2007/03/29 11:06:44 jmc Exp $
+.\"	$OpenBSD: touch.1,v 1.12 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -125,6 +125,12 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr utimes 2
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 The obsolescent form of
 .Nm touch ,
 where a time format is specified as the first argument, is supported.
@@ -150,12 +156,6 @@ If the
 .Dq YY
 letter pair is in the range 69 to 99, the year is set from 1969 to 1999;
 otherwise, the year is set in the 21st century.
-.Pp
-The
-.Nm
-utility is expected to be a superset of the
-.St -p1003.2
-specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 4265155047e..95e6c2ab114 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
+.\"	$OpenBSD: tr.1,v 1.10 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -262,6 +262,12 @@ Strip out non-printable characters from file1.
 .Sh SEE ALSO
 .Xr sed 1
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 System V has historically implemented character ranges using the syntax
 .Dq [c-c]
 instead of the
@@ -315,11 +321,6 @@ and
 options were ignored unless two strings were specified.
 This implementation will not permit illegal syntax.
 .Pp
-The
-.Nm
-utility is expected to be
-.St -p1003.2
-compatible.
 It should be noted that the feature wherein the last character of
 .Ar string2
 is duplicated if
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index aab4736f524..e4eea71713b 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: true.1,v 1.6 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: true.1,v 1.7 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -51,5 +51,6 @@ utility always returns with exit code 0.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index e78dcbb96e0..f51770ca4ff 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tty.1,v 1.10 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: tty.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: tty.1,v 1.4 1994/12/07 00:46:55 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -78,8 +78,13 @@ is not a terminal, or >1 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flag
+.Op Fl s
+is an extension to that specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 62291813070..afb48a88007 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uname.1,v 1.11 2004/02/23 15:01:33 jmc Exp $
+.\"	$OpenBSD: uname.1,v 1.12 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -77,9 +77,14 @@ option had been specified.
 .Xr uname 3
 .Sh STANDARDS
 The
-.Nm uname
-utility conforms to
-.St -p1003.2-92 .
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flag
+.Op Fl p
+is an extension to that specification.
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 7380ea6c021..c93847e0039 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uniq.1,v 1.10 2004/08/10 22:32:05 jmc Exp $
+.\"	$OpenBSD: uniq.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -120,14 +120,14 @@ utility exits 0 on success or \*(Gt0 if an error occurred.
 .Sh SEE ALSO
 .Xr sort 1
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
 The historic
 .Cm + Ns Ar number
 and
 .Fl Ns Ar number
 options have been deprecated but are still supported in this implementation.
-.Pp
-The
-.Nm
-utility is expected to be
-.St -p1003.2
-compatible.
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 56ade86ffdf..03befe0947e 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uuencode.1,v 1.16 2005/01/11 18:30:28 jmc Exp $
+.\"	$OpenBSD: uuencode.1,v 1.17 2007/05/30 04:41:34 jmc Exp $
 .\"	$FreeBSD: uuencode.1,v 1.26 2003/03/18 14:24:47 fanf Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -205,8 +205,13 @@ The
 .Nm uudecode
 and
 .Nm uuencode
-utilities conform to
-.St -p1003.2-92 .
+utilities are compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl ciprs
+are extensions to that specification.
 .Sh HISTORY
 The
 .Nm uudecode
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index db5da43e26a..85f614f00e3 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.35 2005/03/10 18:03:45 jmc Exp $
+.\"	$OpenBSD: vi.1,v 1.36 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -2266,7 +2266,7 @@ source code.
 .Sh STANDARDS
 .Nm nex Ns / Ns Nm nvi
 is close to
-.St -p1003.2 .
+.St -p1003.1-2004 .
 That document differs from historical
 .Nm ex Ns / Ns Nm vi
 practice in several places; there are changes to be made on both sides.
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index c841add4ba5..1caea140e44 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.16 2005/10/19 21:49:02 espie Exp $
+.\"	$OpenBSD: wc.1,v 1.17 2007/05/30 04:41:34 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -118,6 +118,16 @@ utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr isspace 3
 .Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flag
+.Op Fl h
+is an extension to that specification.
+.Pp
 Historically, the
 .Nm
 utility was documented to define a word as a ``maximal string of
@@ -138,17 +148,6 @@ in terms of the
 .Xr isspace 3
 function, as required by
 .St -p1003.2-92 .
-.Pp
-The
-.Nm
-utility conforms to
-.St -p1003.2-92 .
-.Pp
-The
-.Fl h
-option is an
-.Ox
-extension.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 51331bd98e6..acf817ba39d 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: what.1,v 1.10 2006/12/15 12:16:26 jmc Exp $
+.\"	$OpenBSD: what.1,v 1.11 2007/05/30 04:41:34 jmc Exp $
 .\"	$NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -69,8 +69,8 @@ or with a return value of 1 otherwise.
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be a superset of the
-.St -p1003.1
+utility is compliant with the
+.St -p1003.1-2004
 specification.
 .Sh HISTORY
 The
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 45d3962b98b..911d2ea20e7 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: who.1,v 1.19 2004/08/18 21:24:27 jmc Exp $
+.\"	$OpenBSD: who.1,v 1.20 2007/05/30 04:41:35 jmc Exp $
 .\"	$NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -131,8 +131,9 @@ For more information on the special characters, see
 .Sh STANDARDS
 The
 .Nm
-utility is expected to conform to
-.St -p1003.2-92 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 2c31bc54d98..a0bb80efc2a 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xargs.1,v 1.19 2006/08/12 07:10:56 jmc Exp $
+.\"	$OpenBSD: xargs.1,v 1.20 2007/05/30 04:41:35 jmc Exp $
 .\"	$FreeBSD: xargs.1,v 1.30 2003/05/21 21:07:28 ru Exp $$
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -313,16 +313,13 @@ Some other error occurred.
 .Sh STANDARDS
 The
 .Nm
-utility is expected to be
-.St -p1003.2
-compliant.
-The
-.Fl 0 , J , o , P ,
-.Fl R ,
-and
-.Fl r
-options are non-standard
-extensions which may not be available on other operating systems.
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl 0JoPRr
+are extensions to that specification.
 .Pp
 The meanings of the 123, 124, and 125 exit values were taken from
 .Tn GNU
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 64fc5ef22c1..c52f3c3621b 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.17 2004/10/08 20:20:35 otto Exp $
+.\"	$OpenBSD: yacc.1,v 1.18 2007/05/30 04:41:35 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -186,5 +186,10 @@ to the standard error.
 .Sh STANDARDS
 The
 .Nm
-utility conforms to
-.St -p1003.2 .
+utility is compliant with the
+.St -p1003.1-2004
+specification.
+.Pp
+The flags
+.Op Fl or
+are extensions to that specification.