documentation tweaks.

5 files changed, 28 insertions, 26 deletions

diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 924578951fa..9230d50816f 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rup.c,v 1.22 2005/11/17 19:55:05 moritz Exp $	*/
+/*	$OpenBSD: rup.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $	*/
 
 /*-
  * Copyright (c) 1993, John Brezak
@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rup.c,v 1.22 2005/11/17 19:55:05 moritz Exp $";
+static char rcsid[] = "$OpenBSD: rup.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -340,6 +340,6 @@ main(int argc, char *argv[])
 void
 usage(void)
 {
-	fprintf(stderr, "Usage: rup [-dhlt] [hosts ...]\n");
+	fprintf(stderr, "usage: rup [-dhlt] [host ...]\n");
 	exit(1);
 }
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 6d48854bec2..43132959554 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rwall.c,v 1.10 2003/07/09 01:10:30 mickey Exp $	*/
+/*	$OpenBSD: rwall.c,v 1.11 2008/07/09 19:41:56 sobrado Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
@@ -38,7 +38,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$OpenBSD: rwall.c,v 1.10 2003/07/09 01:10:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: rwall.c,v 1.11 2008/07/09 19:41:56 sobrado Exp $";
 #endif /* not lint */
 
 /*
@@ -75,7 +75,7 @@ main(int argc, char *argv[])
 	CLIENT *cl;
 
 	if ((argc < 2) || (argc > 3)) {
-		fprintf(stderr, "usage: %s hostname [file]\n", __progname);
+		fprintf(stderr, "usage: %s host [file]\n", __progname);
 		exit(1);
 	}
 
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 501c208b14b..8d9141fbd91 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tr.c,v 1.13 2004/09/15 22:12:19 deraadt Exp $	*/
+/*	$OpenBSD: tr.c,v 1.14 2008/07/09 19:41:56 sobrado Exp $	*/
 /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
-static char rcsid[] = "$OpenBSD: tr.c,v 1.13 2004/09/15 22:12:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tr.c,v 1.14 2008/07/09 19:41:56 sobrado Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -251,9 +251,10 @@ setup(int *string, char *arg, STR *str, int cflag)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage:\ttr [-cs] string1 string2\n"
-	    "\ttr [-c] -d string1\n"
-	    "\ttr [-c] -s string1\n"
-	    "\ttr [-c] -ds string1 string2\n");
+	fprintf(stderr,
+	    "usage: tr [-cs] string1 string2\n"
+	    "       tr [-c] -d string1\n"
+	    "       tr [-c] -s string1\n"
+	    "       tr [-c] -ds string1 string2\n");
 	exit(1);
 }
diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c
index 5bc0623b264..4e33667f4e6 100644
--- a/usr.sbin/dhcrelay/dhcrelay.c
+++ b/usr.sbin/dhcrelay/dhcrelay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcrelay.c,v 1.29 2007/02/09 16:49:47 stevesk Exp $ */
+/*	$OpenBSD: dhcrelay.c,v 1.30 2008/07/09 19:41:56 sobrado Exp $ */
 
 /*
  * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -265,8 +265,8 @@ usage(void)
 {
 	extern char	*__progname;
 
-	fprintf(stderr, "Usage: %s [-d] ", __progname);
-	fprintf(stderr, "-i interface server1 [... serverN]\n");
+	fprintf(stderr, "usage: %s [-d] -i interface server1 [... serverN]",
+	    __progname);
 	exit(1);
 }
 
diff --git a/usr.sbin/rdate/rdate.c b/usr.sbin/rdate/rdate.c
index 5bcbb7082f3..2ab9981419c 100644
--- a/usr.sbin/rdate/rdate.c
+++ b/usr.sbin/rdate/rdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdate.c,v 1.22 2004/02/18 20:10:53 jmc Exp $	*/
+/*	$OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $	*/
 /*	$NetBSD: rdate.c,v 1.4 1996/03/16 12:37:45 pk Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
 #if 0
 from: static char rcsid[] = "$NetBSD: rdate.c,v 1.3 1996/02/22 06:59:18 thorpej Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: rdate.c,v 1.22 2004/02/18 20:10:53 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: rdate.c,v 1.23 2008/07/09 19:41:56 sobrado Exp $";
 #endif
 #endif				/* lint */
 
@@ -72,15 +72,16 @@ extern char    *__progname;
 void
 usage(void)
 {
-	(void) fprintf(stderr, "Usage: %s [-46acnpsv] host\n", __progname);
-	(void) fprintf(stderr, "  -4: use IPv4 only\n");
-	(void) fprintf(stderr, "  -6: use IPv6 only\n");
-	(void) fprintf(stderr, "  -a: use adjtime instead of instant change\n");
-	(void) fprintf(stderr, "  -c: correct leap second count\n");
-	(void) fprintf(stderr, "  -n: use SNTP instead of RFC868 time protocol\n");
-	(void) fprintf(stderr, "  -p: just print, don't set\n");
-	(void) fprintf(stderr, "  -s: just set, don't print\n");
-	(void) fprintf(stderr, "  -v: verbose output\n");
+	(void) fprintf(stderr, "usage: %s [-46acnpsv] host\n", __progname);
+	(void) fprintf(stderr,
+	    "  -4: use IPv4 only\n"
+	    "  -6: use IPv6 only\n"
+	    "  -a: use adjtime instead of instant change\n"
+	    "  -c: correct leap second count\n"
+	    "  -n: use SNTP instead of RFC868 time protocol\n"
+	    "  -p: just print, don't set\n"
+	    "  -s: just set, don't print\n"
+	    "  -v: verbose output\n");
 }
 
 int