documentation tweaks.

ok (some time ago) jmc@

18 files changed, 51 insertions, 50 deletions

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);
 }