various small fixes;

ok mcbride@

2 files changed, 12 insertions, 8 deletions

diff --git a/usr.sbin/ifstated/ifstated.8 b/usr.sbin/ifstated/ifstated.8
index 04c54acc75d..348d75e45ba 100644
--- a/usr.sbin/ifstated/ifstated.8
+++ b/usr.sbin/ifstated/ifstated.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifstated.8,v 1.3 2004/03/07 08:49:05 mcbride Exp $
+.\" $OpenBSD: ifstated.8,v 1.4 2004/04/27 11:55:27 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
 .\"
@@ -19,18 +19,21 @@
 .Os
 .Sh NAME
 .Nm ifstated
-.Nd "Interface State daemon"
+.Nd Interface State daemon
 .Sh SYNOPSIS
 .Nm ifstated
 .Bk -words
 .Op Fl dhinv
-.Op Fl D Ar macro=value
+.Xo
+.Oo Fl D
+.Ar macro Ns = Ns Ar value Oc
+.Xc
 .Op Fl f Ar file
 .Ek
 .Sh DESCRIPTION
 The
 .Nm
-daemon runs commands in response to network state changes which it
+daemon runs commands in response to network state changes, which it
 determines by monitoring interface link state or running external
 tests.
 For example, it can be used with
@@ -42,7 +45,7 @@ interfaces stay in sync, or with
 to test server or link availability and modify translation or routing rules.
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl D Ar macro=value
+.It Fl D Ar macro Ns = Ns Ar value
 Define
 .Ar macro
 to be set to
@@ -66,7 +69,8 @@ Ignore initial interface states.
 Config test mode.
 Check config validity, then exit.
 .It Fl v
-Verbose mode. Use twice to further increase verbosity.
+Verbose mode.
+Use twice to further increase verbosity.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/ifstated.conf" -compact
diff --git a/usr.sbin/ifstated/ifstated.c b/usr.sbin/ifstated/ifstated.c
index 19304e97814..0a4f51eefab 100644
--- a/usr.sbin/ifstated/ifstated.c
+++ b/usr.sbin/ifstated/ifstated.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifstated.c,v 1.16 2004/03/15 19:42:33 markus Exp $	*/
+/*	$OpenBSD: ifstated.c,v 1.17 2004/04/27 11:55:27 jmc Exp $	*/
 
 /*
  * Copyright (c) 2004 Marco Pfatschbacher <mpf@openbsd.org>
@@ -82,7 +82,7 @@ usage(void)
 {
 	extern char* __progname;
 
-	fprintf(stderr, "usage: %s [-dhinv] [-D macro=value] [-f config]\n",
+	fprintf(stderr, "usage: %s [-dhinv] [-D macro=value] [-f file]\n",
 		__progname);
 	exit(1);
 }