- make SYNOPSIS and usage() clear that -t precedes -T;

spotted by Tamas Tevesh, via dhartmei@;

also, add -o to usage(), and note that /ruleset is now the correct syntax,
not :ruleset;

ok dhartmei@

2 files changed, 12 insertions, 8 deletions

diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index 45c0bbf80e5..44c2c85ea7b 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.113 2004/07/16 23:44:24 frantzen Exp $
+.\" $OpenBSD: pfctl.8,v 1.114 2004/07/23 10:20:42 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Kjell Wooding.  All rights reserved.
 .\"
@@ -48,8 +48,11 @@
 .Op Fl k Ar host
 .Op Fl p Ar device
 .Op Fl s Ar modifier
-.Op Fl T Ar command Op Ar address ...
-.Op Fl t Ar table
+.Oo Xo
+.Fl t Ar table
+.Fl T Ar command
+.Op Ar address ... Oc
+.Xc
 .Op Fl x Ar level
 .Ek
 .Sh DESCRIPTION
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index cdb5888a84a..1666a5cda5d 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl.c,v 1.219 2004/07/19 22:04:00 dlg Exp $ */
+/*	$OpenBSD: pfctl.c,v 1.220 2004/07/23 10:20:42 jmc Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -194,14 +194,15 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-AdeghNnOqRrvz] ", __progname);
-	fprintf(stderr, "[-a anchor[:ruleset]] [-D macro=value]\n");
+	fprintf(stderr, "usage: %s [-AdeghNnOoqRrvz] ", __progname);
+	fprintf(stderr, "[-a anchor[/ruleset]] [-D macro=value]\n");
 	fprintf(stderr, "             ");
 	fprintf(stderr, "[-F modifier] [-f file] [-i interface] ");
 	fprintf(stderr, "[-k host] [-p device]\n");
 	fprintf(stderr, "             ");
-	fprintf(stderr, "[-s modifier] [-T command [address ...]] ");
-	fprintf(stderr, "[-t table] [-x level]\n");
+	fprintf(stderr, "[-s modifier] ");
+	fprintf(stderr, "[-t table -T command [address ...]] ");
+	fprintf(stderr, "[-x level]\n");
 	exit(1);
 }