better synopsis/usage and a couple wee fixes;

mostly ok beck

2 files changed, 10 insertions, 8 deletions

diff --git a/usr.sbin/spamdb/spamdb.8 b/usr.sbin/spamdb/spamdb.8
index 7c3b8682e4e..1d8a51ef9cf 100644
--- a/usr.sbin/spamdb/spamdb.8
+++ b/usr.sbin/spamdb/spamdb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamdb.8,v 1.9 2006/12/09 17:13:07 beck Exp $
+.\"	$OpenBSD: spamdb.8,v 1.10 2006/12/09 20:04:27 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Bob Beck.  All rights reserved.
 .\"
@@ -22,8 +22,10 @@
 .Nd spamd database tool
 .Sh SYNOPSIS
 .Nm spamdb
-.Op Fl adTt
-.Op Ar keys ...
+.Oo Oo Fl Tt Oc
+.Fl a Ar keys Oc
+.Oo Oo Fl Tt Oc
+.Fl d Ar keys Oc
 .Sh DESCRIPTION
 .Nm
 manipulates the spamd database in
@@ -34,7 +36,7 @@ greylisting.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl a
+.It Fl a Ar keys
 Add or update the entries for
 .Ar keys .
 This can be used to whitelist one or more IP addresses
@@ -45,7 +47,7 @@ If any
 specified match entries already in the spamd database,
 .Nm
 updates the entry's time last seen to now.
-.It Fl d
+.It Fl d Ar keys
 Delete entries for
 .Ar keys .
 .It Fl T
@@ -125,7 +127,7 @@ if whitelisted or
 .Em GREY
 if greylisted
 .It source IP
-IP aaddress the connection originated fro
+IP address the connection originated from
 .It from
 envelope-from address for
 .Em GREY
diff --git a/usr.sbin/spamdb/spamdb.c b/usr.sbin/spamdb/spamdb.c
index 903b7702bbc..e4028f3fd23 100644
--- a/usr.sbin/spamdb/spamdb.c
+++ b/usr.sbin/spamdb/spamdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamdb.c,v 1.17 2006/12/09 17:13:07 beck Exp $	*/
+/*	$OpenBSD: spamdb.c,v 1.18 2006/12/09 20:04:27 jmc Exp $	*/
 
 /*
  * Copyright (c) 2004 Bob Beck.  All rights reserved.
@@ -243,7 +243,7 @@ extern char *__progname;
 static int
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-Tt] [-ad] key [key ...]\n", __progname);
+	fprintf(stderr, "usage: %s [[-Tt] -a keys] [[-Tt] -d keys]\n", __progname);
 	exit(1);
 	/* NOTREACHED */
 }