documentation tweaks.

ok (some time ago) jmc@

30 files changed, 116 insertions, 117 deletions

diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 6d8b0082422..ee343b9dec7 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csh.1,v 1.57 2007/05/31 19:19:14 jmc Exp $
+.\"	$OpenBSD: csh.1,v 1.58 2008/05/17 23:31:52 sobrado Exp $
 .\"	$NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)csh.1	8.2 (Berkeley) 1/21/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt CSH 1
 .Os
 .Sh NAME
@@ -1697,24 +1697,24 @@ that does not begin with a
 .Pp
 .It Ic history
 .It Ic history Ar n
-.It Ic history Fl r Ar n
 .It Ic history Fl h Ar n
+.It Ic history Fl r Ar n
 Displays the history event list; if
 .Ar n
 is given, only the
 .Ar n
 most recent events are printed.
 The
-.Fl r
-option reverses the order of printout to be most recent first
-instead of oldest first.
-The
 .Fl h
 option causes the history list to be printed without leading numbers.
 This format produces files suitable for sourcing using the
 .Fl h
 option to
 .Ic source .
+The
+.Fl r
+option reverses the order of printout to be most recent first
+instead of oldest first.
 .Pp
 .It Ic if ( Ar expr ) No command
 If the specified expression evaluates to true, then the single
diff --git a/bin/csh/error.c b/bin/csh/error.c
index 0520505e6b7..7fb5739ccee 100644
--- a/bin/csh/error.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.c,v 1.7 2006/03/17 17:12:36 otto Exp $	*/
+/*	$OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: error.c,v 1.7 2006/03/17 17:12:36 otto Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -170,7 +170,7 @@ static char *errorlist[] =
 #define ERR_STRING	56
     "%s",
 #define ERR_JOBS	57
-    "Usage: jobs [ -l ]",
+    "usage: jobs [-l]",
 #define ERR_JOBARGS	58
     "Arguments should be jobs or process id's",
 #define ERR_JOBCUR	59
@@ -194,7 +194,7 @@ static char *errorlist[] =
 #define ERR_BADDIR	68
     "Bad directory",
 #define ERR_DIRUS	69
-    "Usage: %s [-lvn]%s",
+    "usage: %s [-lnv]%s",
 #define ERR_HFLAG	70
     "No operand for -h flag",
 #define ERR_NOTLOGIN	71
@@ -212,7 +212,7 @@ static char *errorlist[] =
 #define ERR_NOHOME	77
     "No $home variable set",
 #define ERR_HISTUS	78
-    "Usage: history [-rh] [# number of events]",
+    "usage: history [-hr] [n]",
 #define ERR_SPDOLLT	79
     "$, ! or < not allowed with $# or $?",
 #define ERR_NEWLINE	80
diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index 92f561c9ad4..080bb624acf 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ksh.c,v 1.30 2007/08/02 10:50:25 fgsch Exp $	*/
+/*	$OpenBSD: c_ksh.c,v 1.31 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * built-in Korn commands: c_*
@@ -1156,8 +1156,8 @@ c_kill(char **wp)
 	}
 	if ((lflag && t) || (!wp[i] && !lflag)) {
 		shf_fprintf(shl_out,
-		    "Usage: kill [ -s signame | -signum | -signame ] {pid|job}...\n"
-		    "       kill -l [exit_status]\n");
+		    "usage: kill [-s signame | -signum | -signame] { job | pid | pgrp } ...\n"
+		    "       kill -l [exit_status ...]\n");
 		bi_errorf(null);
 		return 1;
 	}
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 9331becda47..c979fbe5fa8 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ksh.1,v 1.121 2008/03/21 12:51:19 millert Exp $
+.\"	$OpenBSD: ksh.1,v 1.122 2008/05/17 23:31:52 sobrado Exp $
 .\"
 .\"	Public Domain
 .\"
-.Dd $Mdocdate: March 21 2008 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt KSH 1
 .Os
 .Sh NAME
@@ -3302,7 +3302,7 @@ is syntactic sugar for
 .Ic mknod
 .Op Fl m Ar mode
 .Ar name
-.Op Cm c | Cm b
+.Op Cm b | Cm c
 .Ar major minor
 .Xc
 .It Xo
diff --git a/bin/pax/options.c b/bin/pax/options.c
index df7b1f1684f..6e91d797462 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.67 2007/02/24 09:50:55 jmc Exp $	*/
+/*	$OpenBSD: options.c,v 1.68 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.67 2007/02/24 09:50:55 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: options.c,v 1.68 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -1537,15 +1537,15 @@ pax_usage(void)
 {
 	(void)fputs(
 	    "usage: pax [-0cdnOvz] [-E limit] [-f archive] [-G group] [-s replstr]\n"
-	    "\t  [-T range] [-U user] [pattern ...]\n"
+	    "           [-T range] [-U user] [pattern ...]\n"
 	    "       pax -r [-0cDdiknOuvYZz] [-E limit] [-f archive] [-G group]\n"
-	    "\t  [-o options] [-p string] [-s replstr] [-T range]\n"
-	    "\t  [-U user] [pattern ...]\n"
+	    "           [-o options] [-p string] [-s replstr] [-T range]\n"
+	    "           [-U user] [pattern ...]\n"
 	    "       pax -w [-0adHiLOPtuvXz] [-B bytes] [-b blocksize] [-f archive]\n"
-	    "\t  [-G group] [-o options] [-s replstr]\n"
-	    "\t  [-T range] [-U user] [-x format] [file ...]\n"
+	    "           [-G group] [-o options] [-s replstr]\n"
+	    "           [-T range] [-U user] [-x format] [file ...]\n"
 	    "       pax -rw [-0DdHikLlnOPtuvXYZ] [-G group] [-p string] [-s replstr]\n"
-	    "\t  [-T range] [-U user] [file ...] directory\n",
+	    "           [-T range] [-U user] [file ...] directory\n",
 	    stderr);
 	exit(1);
 }
@@ -1560,10 +1560,10 @@ tar_usage(void)
 {
 	(void)fputs(
 	    "usage: tar {crtux}[014578befHhLmOoPpqsvwXZz]\n"
-	    "\t  [blocking-factor | archive | replstr] [-C directory] [-I file]\n"
-	    "\t  [file ...]\n"
+	    "           [blocking-factor | archive | replstr] [-C directory] [-I file]\n"
+	    "           [file ...]\n"
 	    "       tar {-crtux} [-014578eHhLmOoPpqvwXZz] [-b blocking-factor]\n"
-	    "\t  [-C directory] [-f archive] [-I file] [-s replstr] [file ...]\n",
+	    "           [-C directory] [-f archive] [-I file] [-s replstr] [file ...]\n",
 	    stderr);
 	exit(1);
 }
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 04be4dd104a..26ee132c41d 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stty.c,v 1.11 2003/06/11 23:42:12 deraadt Exp $	*/
+/*	$OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$NetBSD: stty.c,v 1.11 1995/03/21 09:11:30 cgd Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: stty.c,v 1.11 2003/06/11 23:42:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -154,7 +154,7 @@ args:	argc -= optind;
 void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-a|-e|-g] [-f file] [operands]\n",
+	fprintf(stderr, "usage: %s [-a | -e | -g] [-f file] [operands]\n",
 	    __progname);
 	exit (1);
 }
diff --git a/libexec/rpc.yppasswdd/rpc.yppasswdd.8 b/libexec/rpc.yppasswdd/rpc.yppasswdd.8
index 94518b8a5ef..29359d4a77d 100644
--- a/libexec/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/libexec/rpc.yppasswdd/rpc.yppasswdd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.yppasswdd.8,v 1.20 2007/05/31 19:19:40 jmc Exp $
+.\"	$OpenBSD: rpc.yppasswdd.8,v 1.21 2008/05/17 23:31:52 sobrado Exp $
 .\"
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt RPC.YPPASSWDD 8
 .Os
 .Sh NAME
@@ -34,11 +34,11 @@
 .Sh SYNOPSIS
 .Nm rpc.yppasswdd
 .Bk -words
-.Op Fl d Ar directory
-.Op Fl noshell
 .Op Fl nogecos
 .Op Fl nopw
-.Op Fl m Ar arg1 arg2 ...
+.Op Fl noshell
+.Op Fl d Ar directory
+.Op Fl m Ar arg ...
 .Ek
 .Sh DESCRIPTION
 .Nm rpc.yppasswdd
@@ -65,18 +65,18 @@ The options are as follows:
 Use the specified directory to get at the password-related files instead
 of
 .Pa /etc .
-.It Fl noshell
-Don't allow changes of the shell field in the passwd file.
-.It Fl nogecos
-Don't allow changes of the gecos field in the passwd file.
-.It Fl nopw
-Don't allow changes of the password in the passwd file.
-.It Fl m Ar arg1 arg2 ...
+.It Fl m Ar arg ...
 Pass the specified arguments to
 .Xr make 1
 when invoking it in
 .Pa /var/yp
 to rebuild the passwd maps.
+.It Fl nogecos
+Don't allow changes of the gecos field in the passwd file.
+.It Fl nopw
+Don't allow changes of the password in the passwd file.
+.It Fl noshell
+Don't allow changes of the shell field in the passwd file.
 .El
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
diff --git a/libexec/rpc.yppasswdd/rpc.yppasswdd.c b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
index f1aad579fda..934662295ff 100644
--- a/libexec/rpc.yppasswdd/rpc.yppasswdd.c
+++ b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.yppasswdd.c,v 1.19 2006/04/02 01:29:29 deraadt Exp $	*/
+/*	$OpenBSD: rpc.yppasswdd.c,v 1.20 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.19 2006/04/02 01:29:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.20 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 
 #include <sys/types.h>
@@ -59,8 +59,8 @@ static void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: rpc.yppasswdd [-d dir] [-noshell] [-nogecos] [-nopw]\n"
-	    "       [-m arg1 arg2 ... ]\n");
+	    "usage: rpc.yppasswdd [-nogecos] [-nopw] [-noshell] [-d directory] "
+	    "[-m arg ...]\n");
 	exit(1);
 }
 
diff --git a/libexec/tcpd/tcpdchk/tcpdchk.8 b/libexec/tcpd/tcpdchk/tcpdchk.8
index e9807a79b32..dedf5cd398f 100644
--- a/libexec/tcpd/tcpdchk/tcpdchk.8
+++ b/libexec/tcpd/tcpdchk/tcpdchk.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdchk.8,v 1.12 2007/05/31 19:19:41 jmc Exp $
+.\"	$OpenBSD: tcpdchk.8,v 1.13 2008/05/17 23:31:52 sobrado Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt TCPDCHK 8
 .Os
 .Sh NAME
@@ -31,10 +31,8 @@
 .Nd tcp wrapper configuration checker
 .Sh SYNOPSIS
 .Nm tcpdchk
-.Op Fl a
-.Op Fl d
+.Op Fl adv
 .Op Fl i Ar inet_conf
-.Op Fl v
 .Sh DESCRIPTION
 .Nm
 examines your tcp wrapper configuration and reports all
diff --git a/libexec/tcpd/tcpdchk/tcpdchk.c b/libexec/tcpd/tcpdchk/tcpdchk.c
index 7b14f4a3f22..28e361a6e4b 100644
--- a/libexec/tcpd/tcpdchk/tcpdchk.c
+++ b/libexec/tcpd/tcpdchk/tcpdchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpdchk.c,v 1.9 2006/12/20 01:50:30 ray Exp $	*/
+/*	$OpenBSD: tcpdchk.c,v 1.10 2008/05/17 23:31:52 sobrado Exp $	*/
 
  /*
   * tcpdchk - examine all tcpd access control rules and inetd.conf entries
@@ -20,7 +20,7 @@
 #if 0
 static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";
 #else
-static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.9 2006/12/20 01:50:30 ray Exp $";
+static char rcsid[] = "$OpenBSD: tcpdchk.c,v 1.10 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif
 
@@ -188,7 +188,7 @@ int     main(int argc, char *argv[])
 
 static void usage()
 {
-    fprintf(stderr, "usage: %s [-a] [-d] [-i inet_conf] [-v]\n", myname);
+    fprintf(stderr, "usage: %s [-adv] [-i inet_conf]\n", myname);
     fprintf(stderr, "	-a: report rules with implicit \"ALLOW\" at end\n");
     fprintf(stderr, "	-d: use allow/deny files in current directory\n");
     fprintf(stderr, "	-i: location of inetd.conf file\n");
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index b8ca6120bbd..ecf997e107b 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.20 2005/06/08 03:18:59 pvalchev Exp $	*/
+/*	$OpenBSD: main.c,v 1.21 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.20 2005/06/08 03:18:59 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.21 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -164,7 +164,7 @@ set_signals(void)
 void
 usage(void)
 {
-    fprintf(stderr, "usage: %s [-dlrtv] [-b file_prefix] [-o outputfile] [-p symbol_prefix] filename\n", __progname);
+    fprintf(stderr, "usage: %s [-dlrtv] [-b file_prefix] [-o output_file] [-p symbol_prefix] file\n", __progname);
     exit(1);
 }
 
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 6aab55a0c3a..0ad2336369e 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.19 2007/05/31 19:20:20 jmc Exp $
+.\"	$OpenBSD: yacc.1,v 1.20 2008/05/17 23:31:52 sobrado Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	from: @(#)yacc.1	5.7 (Berkeley) 7/30/91
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt YACC 1
 .Os
 .Sh NAME
@@ -43,14 +43,14 @@ parser generator
 .Sh SYNOPSIS
 .Nm yacc
 .Op Fl dlrtv
-.Op Fl b Ar prefix
+.Op Fl b Ar file_prefix
 .Op Fl o Ar output_file
 .Op Fl p Ar symbol_prefix
-.Ar filename
+.Ar file
 .Sh DESCRIPTION
 .Nm
-reads the grammar specification in the file
-.Ar filename
+reads the grammar specification in
+.Ar file
 and generates an
 .Tn LR(1)
 parser for it.
@@ -64,12 +64,12 @@ normally writes the parse tables and the driver routine to the file
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl b Ar prefix
+.It Fl b Ar file_prefix
 The
 .Fl b
 option changes the prefix prepended to the output file names to
 the string denoted by
-.Ar prefix .
+.Ar file_prefix .
 The default prefix is the character
 .Ar y .
 .It Fl d
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 25e043225c2..0f9968b84b9 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: faithd.8,v 1.32 2007/05/31 19:20:23 jmc Exp $
+.\"	$OpenBSD: faithd.8,v 1.33 2008/05/17 23:31:52 sobrado Exp $
 .\"	$KAME: faithd.8,v 1.36 2002/05/09 13:59:16 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt FAITHD 8
 .Os
 .Sh NAME
@@ -152,7 +152,7 @@ will invoke a local daemon at
 .Ar serverpath
 if the destination address is a local interface address,
 and will perform translation to IPv4 TCP in other cases.
-.Ar Serverargs
+.Ar serverargs
 can also be specified as
 arguments for the local daemon.
 .Pp
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index f52c4bfaad2..b1d5ec60290 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: faithd.c,v 1.28 2003/10/16 05:27:33 itojun Exp $	*/
+/*	$OpenBSD: faithd.c,v 1.29 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$KAME: faithd.c,v 1.58 2002/09/08 01:12:30 itojun Exp $	*/
 
 /*
@@ -882,7 +882,8 @@ update_myaddrs()
 static void
 usage()
 {
-	fprintf(stderr, "usage: %s [-dp] [-f conf] service [serverpath [serverargs]]\n",
+	fprintf(stderr,
+	    "usage: %s [-dp] [-f configfile] service [serverpath [serverargs]]\n",
 	    faithdname);
 	exit(0);
 }
diff --git a/usr.sbin/httpd/src/support/logresolve.c b/usr.sbin/httpd/src/support/logresolve.c
index 662145b6d1d..e61b2d1803e 100644
--- a/usr.sbin/httpd/src/support/logresolve.c
+++ b/usr.sbin/httpd/src/support/logresolve.c
@@ -6,7 +6,7 @@
  *
  * Rewritten by David Robinson. (drtr@ast.cam.ac.uk)
  *
- * Usage: logresolve [-s filename] [-c] < access_log > new_log
+ * usage: logresolve [-c] [-s filename] < access_log > access_log.new
  *
  * Arguments:
  *    -s filename     name of a file to record statistics
@@ -297,8 +297,8 @@ static int getline (char *s, int n)
 
 static void usage(void)
 {
-    fprintf(stderr, "Usage: logresolve [-s statfile] [-c]");
-    fprintf(stderr, " < input > output\n");
+    fprintf(stderr,
+        "usage: logresolve [-c] [-s filename] < access_log > access_log.new\n");
     exit(1);
 }
 
diff --git a/usr.sbin/httpd/src/support/rotatelogs.c b/usr.sbin/httpd/src/support/rotatelogs.c
index 1137bce377e..ffb978349b5 100644
--- a/usr.sbin/httpd/src/support/rotatelogs.c
+++ b/usr.sbin/httpd/src/support/rotatelogs.c
@@ -31,10 +31,7 @@ int main (int argc, char **argv)
 
 
     if (argc < 3) {
-        fprintf(stderr,
-                "Usage: %s <logfile> <rotation time in seconds> "
-                "[offset minutes from UTC]\n\n",
-                argv[0]);
+        fprintf(stderr, "usage: %s logfile rotationtime [offset]\n\n", argv[0]);
         fprintf(stderr,
                 "Add this:\n\nTransferLog \"|%s /some/where 86400\"\n\n",
                 argv[0]);
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index b50e0e50724..8e0f9a38413 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtree.c,v 1.18 2003/07/26 17:34:18 millert Exp $	*/
+/*	$OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: mtree.c,v 1.18 2003/07/26 17:34:18 millert Exp $";
+static const char rcsid[] = "$OpenBSD: mtree.c,v 1.19 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 #endif /* not lint */
 
@@ -170,6 +170,8 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-"usage: mtree [-cdeilnqrtUux] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n");
+	    "usage: mtree [-cdeilnqrtUux] [-f spec] [-K keywords] "
+	    "[-k keywords] [-p path]\n"
+	    "             [-s seed]\n");
 	exit(1);
 }
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index e4a7e1354d5..f76e0464dd3 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ndp.8,v 1.24 2007/05/31 19:20:26 jmc Exp $
+.\"	$OpenBSD: ndp.8,v 1.25 2008/05/17 23:31:52 sobrado Exp $
 .\"	$KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt NDP 8
 .Os
 .\"
@@ -46,7 +46,7 @@
 .Op Fl d Ar hostname
 .Op Fl f Ar filename
 .Op Fl I Op Ar interface | Ic delete
-.Op Fl i Ar interface Op Ar flags ...
+.Op Fl i Ar interface Op Ar flag ...
 .Oo
 .Fl s Ar nodename etheraddr
 .Op Ic temp
@@ -136,7 +136,7 @@ Specifies the default
 to be used when there is no interface specified even though required.
 .It Fl I Ic delete
 The current default interface will be deleted from the kernel.
-.It Fl i Ar interface Op Ar flags ...
+.It Fl i Ar interface Op Ar flag ...
 View ND information for the specified interface.
 If additional arguments
 .Ar flags
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index de2eca71e56..f032895f4ed 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.40 2008/05/05 13:53:48 markus Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.41 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$KAME: ndp.c,v 1.101 2002/07/17 08:46:33 itojun Exp $	*/
 
 /*
@@ -830,7 +830,7 @@ usage(void)
 #ifdef SIOCSDEFIFACE_IN6
 	printf("[-I [interface | delete]] ");
 #endif
-	printf("[-i interface [flags...]]\n");
+	printf("[-i interface [flag ...]]\n");
 	printf("\t[-s nodename etheraddr [temp] [proxy]] [hostname]\n");
 	exit(1);
 }
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index ffea15e8703..2e630d9ed41 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.13 2007/03/05 20:29:14 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.13 2007/03/05 20:29:14 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.14 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 
 #include <sys/types.h>
@@ -706,6 +706,6 @@ usage(void)
 {
 	extern const char *__progname;
 
-	fprintf(stderr, "usage: %s [-o db] file\n", __progname);
+	fprintf(stderr, "usage: %s [-o database] file\n", __progname);
 	exit(1);
 }
diff --git a/usr.sbin/popa3d/startup.c b/usr.sbin/popa3d/startup.c
index 88e9b9ade5e..0e41d5d6499 100644
--- a/usr.sbin/popa3d/startup.c
+++ b/usr.sbin/popa3d/startup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startup.c,v 1.6 2004/07/20 17:07:34 millert Exp $ */
+/* $OpenBSD: startup.c,v 1.7 2008/05/17 23:31:52 sobrado Exp $ */
 
 /*
  * Command line option parsing.
@@ -36,7 +36,7 @@ int af = PF_UNSPEC;
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: %s [-46DV]\n", progname);
+	fprintf(stderr, "usage: %s [-46DV]\n", progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 11054be44ec..a4df79232f1 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -18,9 +18,9 @@
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\" @(#) $Id: rarpd.8,v 1.14 2007/05/31 19:20:28 jmc Exp $
+.\" @(#) $Id: rarpd.8,v 1.15 2008/05/17 23:31:52 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt RARPD 8
 .Os
 .Sh NAME
@@ -29,7 +29,7 @@
 .Sh SYNOPSIS
 .Nm rarpd
 .Op Fl adflt
-.Op Ar interface
+.Ar interface
 .Sh DESCRIPTION
 .Nm
 services Reverse ARP requests on the Ethernet connected to
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 39376638d21..3ae0eab4a33 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.47 2006/04/02 00:50:42 deraadt Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,15 +28,14 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.47 2006/04/02 00:50:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.48 2008/05/17 23:31:52 sobrado Exp $";
 #endif
 
 
 /*
  * rarpd - Reverse ARP Daemon
  *
- * Usage:	rarpd -a [-d] [-f] [-l] [-t]
- *		rarpd [-d] [-f] [-l] [-t] interface
+ * usage:	rarpd [-adflt] interface
  */
 
 #include <stdio.h>
@@ -258,8 +257,7 @@ init_all(void)
 void
 usage(void)
 {
-	(void) fprintf(stderr, "usage: rarpd -a [-dflt]\n");
-	(void) fprintf(stderr, "       rarpd [-dflt] interface\n");
+	(void) fprintf(stderr, "usage: rarpd [-adflt] interface\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/rdconfig/rdconfig.c b/usr.sbin/rdconfig/rdconfig.c
index be169375717..8cd45c57abe 100644
--- a/usr.sbin/rdconfig/rdconfig.c
+++ b/usr.sbin/rdconfig/rdconfig.c
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
 	int nblks, fd;
 
 	if (argc <= 2) {
-		fprintf(stderr, "usage: rdconfig <device> <%d-byte-blocks>\n",
+		fprintf(stderr, "usage: rdconfig special_file %d-byte-blocks\n",
 		    DEV_BSIZE);
 		exit(1);
 	}
diff --git a/usr.sbin/relayd/relayd.c b/usr.sbin/relayd/relayd.c
index ac6e133b05c..e047b5854cb 100644
--- a/usr.sbin/relayd/relayd.c
+++ b/usr.sbin/relayd/relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.75 2008/05/12 19:15:02 pyr Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.76 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
@@ -114,7 +114,8 @@ usage(void)
 {
 	extern char	*__progname;
 
-	fprintf(stderr, "%s [-dnv] [-D macro=value] [-f file]\n", __progname);
+	fprintf(stderr, "usage: %s [-dnv] [-D macro=value] [-f file]\n",
+	    __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 2045eeb02b3..284b9941e98 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rip6query.c,v 1.12 2004/07/09 16:22:04 deraadt Exp $	*/
+/*	$OpenBSD: rip6query.c,v 1.13 2008/05/17 23:31:52 sobrado Exp $	*/
 /*	$KAME: rip6query.c,v 1.17 2002/09/08 01:35:17 itojun Exp $	*/
 
 /*
@@ -183,7 +183,8 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: rip6query [-I iface] [-w wait] address\n");
+	fprintf(stderr,
+	    "usage: rip6query [-I interface] [-w time] destination\n");
 }
 
 /* getnameinfo() is preferred as we may be able to show ifindex as ifname */
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 727ee524fd8..df64fa80528 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd.c,v 1.7 2003/07/06 21:26:14 deraadt Exp $	*/
+/*	$OpenBSD: lockd.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -63,7 +63,8 @@ main(int argc, char *argv[])
 
 	if (argc > 1) {
 		if (strncmp(argv[1], "-d", 2)) {
-			fprintf(stderr, "Usage: rpc.lockd [-d debuglevel]\n");
+			fprintf(stderr,
+			    "usage: rpc.lockd [-d [debug_level]]\n");
 			exit(1);
 		}
 		if (argc > 2)
diff --git a/usr.sbin/snmpctl/snmpctl.8 b/usr.sbin/snmpctl/snmpctl.8
index 7de6da6f19d..ed46d31fde6 100644
--- a/usr.sbin/snmpctl/snmpctl.8
+++ b/usr.sbin/snmpctl/snmpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpctl.8,v 1.7 2008/01/31 19:40:38 jmc Exp $
+.\" $OpenBSD: snmpctl.8,v 1.8 2008/05/17 23:31:52 sobrado Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -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: January 31 2008 $
+.Dd $Mdocdate: May 17 2008 $
 .Dt SNMPCTL 8
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm
 .Op Fl n
 .Ar command
-.Op Ar arguments ...
+.Op Ar arg ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/snmpctl/snmpctl.c b/usr.sbin/snmpctl/snmpctl.c
index c52725f6112..41a8f3d9efb 100644
--- a/usr.sbin/snmpctl/snmpctl.c
+++ b/usr.sbin/snmpctl/snmpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpctl.c,v 1.7 2008/01/18 02:09:30 reyk Exp $	*/
+/*	$OpenBSD: snmpctl.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
@@ -74,7 +74,7 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-n] <command> [arg [...]]\n", __progname);
+	fprintf(stderr, "usage: %s [-n] command [arg ...]\n", __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c
index f83b8bbb9d6..16252ecca89 100644
--- a/usr.sbin/wsconscfg/wsconscfg.c
+++ b/usr.sbin/wsconscfg/wsconscfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconscfg.c,v 1.12 2005/05/27 05:01:28 millert Exp $ */
+/* $OpenBSD: wsconscfg.c,v 1.13 2008/05/17 23:31:52 sobrado Exp $ */
 /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */
 
 /*
@@ -58,8 +58,8 @@ usage(void)
 	extern char *__progname;
 
 	(void)fprintf(stderr,
-		      "Usage: %s [-dFkm] [-e emul] [-f ctldev] "
-		      "[-t type] index\n", __progname);
+	    "usage: %s [-dFkm] [-e emul] [-f ctldev] [-t type] index\n",
+	    __progname);
 	exit(1);
 }