26 files changed, 79 insertions, 133 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 579ff2dee80..5ac8b5b89a4 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cat.1,v 1.27 2007/05/31 19:19:00 jmc Exp $
+.\"	$OpenBSD: cat.1,v 1.28 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: cat.1,v 1.12 1995/09/27 05:38:55 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CAT 1
 .Os
 .Sh NAME
@@ -102,9 +102,7 @@ characters (with the high bit set) are printed as
 (for meta) followed by the character for the low 7 bits.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std cat
 .Sh EXAMPLES
 Print the contents of
 .Ar file1
diff --git a/bin/chmod/chgrp.1 b/bin/chmod/chgrp.1
index 64ad4f67d54..e9eb6fbde5c 100644
--- a/bin/chmod/chgrp.1
+++ b/bin/chmod/chgrp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chgrp.1,v 1.10 2007/05/31 19:19:13 jmc Exp $
+.\"	$OpenBSD: chgrp.1,v 1.11 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     from: @(#)chgrp.1	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CHGRP 1
 .Os
 .Sh NAME
@@ -103,9 +103,7 @@ The user invoking
 must belong to the specified group and be the owner of the file,
 or be the superuser.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std chgrp
 .Sh FILES
 .Bl -tag -width /etc/group -compact
 .It Pa /etc/group
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 7213f99f114..d1605906539 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.1,v 1.32 2007/05/31 19:19:13 jmc Exp $
+.\"	$OpenBSD: chmod.1,v 1.33 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CHMOD 1
 .Os
 .Sh NAME
@@ -98,9 +98,7 @@ command's actions are determined by the last one specified.
 Only the file's owner or the superuser is permitted to change
 the mode of a file.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std chmod
 .Ss Absolute modes
 Absolute modes are specified according to the following format:
 .Bd -filled -offset indent
diff --git a/bin/chmod/chown.8 b/bin/chmod/chown.8
index e800cd030d2..2313cc1f417 100644
--- a/bin/chmod/chown.8
+++ b/bin/chmod/chown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.8,v 1.11 2007/05/31 19:19:13 jmc Exp $
+.\"	$OpenBSD: chown.8,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)chown.8	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CHOWN 8
 .Os
 .Sh NAME
@@ -132,9 +132,7 @@ to zero.
 .Pp
 Only the superuser is permitted to change the owner of a file.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std chown
 .Sh SEE ALSO
 .Xr chgrp 1 ,
 .Xr find 1 ,
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 266d6918d36..beb2846d6ba 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cp.1,v 1.29 2007/09/16 18:13:57 sobrado Exp $
+.\"	$OpenBSD: cp.1,v 1.30 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: September 16 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CP 1
 .Os
 .Sh NAME
@@ -193,9 +193,7 @@ option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std cp
 .Sh EXAMPLES
 Make a copy of file
 .Pa foo
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index da62e3dc33e..a6d796e2b63 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: echo.1,v 1.15 2007/05/31 19:19:14 jmc Exp $
+.\"	$OpenBSD: echo.1,v 1.16 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: echo.1,v 1.7 1995/03/21 09:04:26 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt ECHO 1
 .Os
 .Sh NAME
@@ -60,9 +60,7 @@ The options are as follows:
 Do not print the trailing newline character.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std echo
 .Sh SEE ALSO
 .Xr printf 1
 .Sh STANDARDS
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 570a0528f5f..44b426d2235 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ln.1,v 1.25 2007/09/16 18:13:57 sobrado Exp $
+.\"	$OpenBSD: ln.1,v 1.26 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: ln.1,v 1.10 1995/07/25 19:37:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: September 16 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt LN 1
 .Os
 .Sh NAME
@@ -123,9 +123,7 @@ makes links in
 to all the named source files.
 The links made will have the same name as the files being linked to.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std ln
 .Sh EXAMPLES
 Create a symbolic link named
 .Pa /home/www
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 94986421524..40252868d5e 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd.1,v 1.14 2008/01/11 20:16:02 jmc Exp $
+.\"	$OpenBSD: pwd.1,v 1.15 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: pwd.1,v 1.10 1995/09/07 06:47:30 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: January 11 2008 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt PWD 1
 .Os
 .Sh NAME
@@ -56,9 +56,7 @@ For an explanation of the directory hierarchy,
 see
 .Xr hier 7 .
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std pwd
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr ksh 1 ,
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index faf9004463d..b114f90c815 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.34 2007/06/25 09:56:18 jmc Exp $
+.\"	$OpenBSD: stty.1,v 1.35 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)stty.1	8.5 (Berkeley) 6/1/94
 .\"
-.Dd $Mdocdate: June 25 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt STTY 1
 .Os
 .Sh NAME
@@ -643,9 +643,7 @@ character when
 is set.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std stty
 .Sh SEE ALSO
 .Xr termios 4 ,
 .Xr tty 4
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index fd22f9c04b5..74a1c15fdc3 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: nfsd.8,v 1.15 2007/05/31 19:19:46 jmc Exp $
+.\"   $OpenBSD: nfsd.8,v 1.16 2009/01/04 11:19:55 sobrado Exp $
 .\"   $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt NFSD 8
 .Os
 .Sh NAME
@@ -100,9 +100,7 @@ server specification; see
 RFC 1094 and
 .%T "NFS: Network File System Version 3 Protocol Specification" .
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std nfsd
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
 .Xr nfssvc 2 ,
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index fa69068863d..1e3bda3feb6 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: asa.1,v 1.14 2007/05/31 19:20:07 jmc Exp $
+.\"	$OpenBSD: asa.1,v 1.15 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: asa.1,v 1.4 1995/03/26 02:25:05 glass Exp $
 .\"
 .\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -29,7 +29,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: January 4 2009 $
 .Dt ASA 1
 .Os
 .Sh NAME
@@ -75,9 +75,7 @@ Lines beginning with characters other than the above are treated as if they
 begin with a space
 .Pq Sq \ \& .
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std asa
 .Sh EXAMPLES
 To view a file containing the output of a
 .Tn FORTRAN
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index d9fa7396563..473d16b463f 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: basename.1,v 1.14 2007/05/31 19:20:07 jmc Exp $
+.\"	$OpenBSD: basename.1,v 1.15 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt BASENAME 1
 .Os
 .Sh NAME
@@ -55,10 +55,7 @@ if given.
 The resulting filename is written to the standard output.
 A non-existent suffix is ignored.
 .Pp
-The
-.Nm
-utility
-exits 0 on success or >0 if an error occurred.
+.Ex -std basename
 .Sh EXAMPLES
 The following line sets the shell variable
 .Ev FOO
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 308960a9c7d..8d2d067402e 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cap_mkdb.1,v 1.15 2007/05/31 19:20:08 jmc Exp $
+.\"	$OpenBSD: cap_mkdb.1,v 1.16 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt CAP_MKDB 1
 .Os
 .Sh NAME
@@ -100,9 +100,7 @@ The data field of this key/data pair is used to look up a key/data
 pair of the first type which has the real data associated with the
 name.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std cap_mkdb
 .Sh FILES
 .Bl -tag -width /usr/share/misc/terminfo.db -compact
 .It Pa /usr/share/misc/termcap
diff --git a/usr.bin/dirname/dirname.1 b/usr.bin/dirname/dirname.1
index 7b41327096a..a5976007393 100644
--- a/usr.bin/dirname/dirname.1
+++ b/usr.bin/dirname/dirname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dirname.1,v 1.5 2007/05/31 19:20:09 jmc Exp $
+.\"	$OpenBSD: dirname.1,v 1.6 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     @(#)dirname.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt DIRNAME 1
 .Os
 .Sh NAME
@@ -50,10 +50,7 @@ character to the end of
 .Ar pathname ,
 and writes the result to the standard output.
 .Pp
-The
-.Nm
-utility
-exits 0 on success or >0 if an error occurred.
+.Ex -std dirname
 .Sh EXAMPLES
 The following line sets the shell variable
 .Ev FOO
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 5434d844357..decb415ec62 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gencat.1,v 1.12 2007/05/31 19:20:10 jmc Exp $
+.\"	$OpenBSD: gencat.1,v 1.13 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1997 Ken Stailey
 .\"
@@ -24,9 +24,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: gencat.1,v 1.12 2007/05/31 19:20:10 jmc Exp $
+.\"	$Id: gencat.1,v 1.13 2009/01/04 11:19:55 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt GENCAT 1
 .Os
 .Sh NAME
@@ -173,9 +173,7 @@ is used to continue the line onto the next line, e.g.,
 If the character following the backslash is not one of those specified,
 the backslash is ignored.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std gencat
 .Sh SEE ALSO
 .Xr catclose 3 ,
 .Xr catgets 3 ,
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index f37edb2166c..2c2fc18cdeb 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getconf.1,v 1.8 2007/05/31 19:20:10 jmc Exp $
+.\"	$OpenBSD: getconf.1,v 1.9 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt GETCONF 1
 .Os
 .Sh NAME
@@ -57,9 +57,7 @@ The
 argument must be supplied for system variables associated with a
 pathname.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std getconf
 .Sh SEE ALSO
 .Xr pathconf 2 ,
 .Xr confstr 3 ,
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index ee072a84449..952e8c1e516 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: groups.1,v 1.10 2007/05/31 19:20:11 jmc Exp $
+.\"	$OpenBSD: groups.1,v 1.11 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)groups.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt GROUPS 1
 .Os
 .Sh NAME
@@ -54,8 +54,6 @@ The
 utility displays the groups to which you (or the optionally specified user)
 belong.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std groups
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 75e1f864fdc..41eb598ea34 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: id.1,v 1.14 2007/05/31 19:20:11 jmc Exp $
+.\"	$OpenBSD: id.1,v 1.15 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
 .\"
 .\" Copyright (c) 1991, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)id.1	8.2 (Berkeley) 5/5/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt ID 1
 .Os
 .Sh NAME
@@ -115,9 +115,7 @@ options instead of the effective ID.
 Display the effective user ID as a number.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std id
 .Sh SEE ALSO
 .Xr who 1
 .Sh STANDARDS
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 8f7783de006..a5748390dee 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whoami.1,v 1.11 2007/05/31 19:20:11 jmc Exp $
+.\"	$OpenBSD: whoami.1,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)whoami.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt WHOAMI 1
 .Os
 .Sh NAME
@@ -52,8 +52,6 @@ The
 .Nm
 utility displays your effective user ID as a name.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std whoami
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 2fec214ccaa..72b1c4fb977 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: logname.1,v 1.11 2007/05/31 19:20:12 jmc Exp $
+.\"	$OpenBSD: logname.1,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt LOGNAME 1
 .Os
 .Sh NAME
@@ -57,9 +57,7 @@ and
 environment variables
 because the environment cannot be trusted.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std logname
 .Sh SEE ALSO
 .Xr who 1 ,
 .Xr whoami 1 ,
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 5bc3bcf20d9..0cdb50b08d4 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: paste.1,v 1.11 2007/08/06 19:16:06 sobrado Exp $
+.\"	$OpenBSD: paste.1,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"	from: @(#)paste.1	5.6 (Berkeley) 7/27/91
 .\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt PASTE 1
 .Os
 .Sh NAME
@@ -108,9 +108,7 @@ input is used; standard input is read one line at a time, circularly,
 for each instance of
 .Dq - .
 .Pp
-The
-.Nm paste
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std paste
 .Sh EXAMPLES
 List the files in the current directory in three columns:
 .Pp
diff --git a/usr.bin/readlink/readlink.1 b/usr.bin/readlink/readlink.1
index 171ff288c09..daf244336be 100644
--- a/usr.bin/readlink/readlink.1
+++ b/usr.bin/readlink/readlink.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readlink.1,v 1.11 2007/05/31 19:20:15 jmc Exp $
+.\"	$OpenBSD: readlink.1,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt READLINK 1
 .Os
 .Sh NAME
@@ -68,9 +68,7 @@ The argument does not need to be a symbolic link.
 Do not print a trailing newline character.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std readlink
 .Sh SEE ALSO
 .Xr readlink 2 ,
 .Xr realpath 3
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index e56f4e9b4cc..7a4f76473cc 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tee.1,v 1.7 2007/05/31 19:20:17 jmc Exp $
+.\"	$OpenBSD: tee.1,v 1.8 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: tee.1,v 1.4 1994/12/09 01:43:37 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt TEE 1
 .Os
 .Sh NAME
@@ -75,9 +75,7 @@ except in the event of the
 .Fl i
 option.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std tee
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 6ec2c135692..4e12ef39b96 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: touch.1,v 1.14 2007/08/06 19:16:06 sobrado Exp $
+.\"	$OpenBSD: touch.1,v 1.15 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: August 6 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt TOUCH 1
 .Os
 .Sh NAME
@@ -119,9 +119,7 @@ If the
 letter pair is not specified, the value defaults to 0.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std touch
 .Sh SEE ALSO
 .Xr utimes 2
 .Sh STANDARDS
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 748ea6a0eea..4f089b09968 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.11 2007/05/31 19:20:18 jmc Exp $
+.\"	$OpenBSD: tr.1,v 1.12 2009/01/04 11:19:55 sobrado Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt TR 1
 .Os
 .Sh NAME
@@ -241,9 +241,7 @@ has a leading zero, it is interpreted as an octal value; otherwise,
 it's interpreted as a decimal value.
 .El
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std tr
 .Sh EXAMPLES
 The following examples are shown as given to the shell:
 .Pp
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index a44a895a987..c95550def1f 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.18 2007/05/31 19:20:20 jmc Exp $
+.\"	$OpenBSD: wc.1,v 1.19 2009/01/04 11:19:55 sobrado Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     from: @(#)wc.1	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 4 2009 $
 .Dt WC 1
 .Os
 .Sh NAME
@@ -112,9 +112,7 @@ The counts for lines, words, and bytes
 .Pq or characters
 are integers separated by spaces.
 .Pp
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std wc
 .Sh SEE ALSO
 .Xr isspace 3
 .Sh STANDARDS