--- bogoutil.c.orig	2004-12-24 18:48:20.000000000 -0500
+++ bogoutil.c	2004-12-26 08:13:16.283502240 -0500
@@ -1,4 +1,4 @@
-/* $Id: bogoutil.c,v 1.152 2004/12/24 23:48:20 relson Exp $ */
+/* $Id: bogoutil.c,v 1.154 2004/12/25 14:49:04 relson Exp $ */
 
 /*****************************************************************************
 
@@ -437,8 +437,12 @@
 
 static void usage(void)
 {
-    fprintf(stderr, "Usage: %s { -d | -l | -w | -p } file%s | { -r | -R | -f | -F | -P } directory | [ -v | -h | -V ]\n", 
+    fprintf(stderr, "Usage: %s [ -h | -v | -V ]\n",
+	    progname);
+    fprintf(stderr, "   or: %s { -d | -l | -m | -w | -p | --db-verify } file%s\n",
 	    progname, DB_EXT);
+    fprintf(stderr, "   or: %s { -r | -R | --db-prune --db-recover --db-recover-harder --db-remove-environment } directory\n",
+	    progname);
 }
 
 static const char *help_text[] = {
@@ -465,7 +469,7 @@
     "  -x, --debug-flags=list    - set flags to display debug information.\n",
 
     "database maintenance:\n",
-    "  -m                        - enable maintenance works (expiring tokens).\n",
+    "  -m file                   - enable maintenance works (expiring tokens).\n",
     "  -n                        - replace non-ascii characters with '?'.\n",
     "  -a age                    - exclude tokens with older ages.\n",
     "  -c cnt                    - exclude tokens with lower counts.\n",
@@ -473,12 +477,12 @@
     "  -y, --timestamp-date=date - set default date (format YYYYMMDD).\n",
 
     "environment maintenance:\n",
-    "  -k, --db_cachesize=size     - set Berkeley DB cache size (MB).\n",
-    "      --db_verify=file        - verify data file.\n",
-    "      --db_prune=dir          - remove inactive log files in dir.\n",
-    "      --db_recover=dir        - run recovery on database in dir.\n",
-    "      --db_recover-harder=dir - run catastrophic recovery on database.\n",
-    "      --db_remove-environment - remove environment.\n",
+    "  -k, --db-cachesize=size     - set Berkeley DB cache size (MB).\n",
+    "      --db-verify=file        - verify data file.\n",
+    "      --db-prune=dir          - remove inactive log files in dir.\n",
+    "      --db-recover=dir        - run recovery on database in dir.\n",
+    "      --db-recover-harder=dir - run catastrophic recovery on database.\n",
+    "      --db-remove-environment - remove environment.\n",
 
 #ifdef	HAVE_DECL_DB_CREATE
     "      --db_lk_max_locks       - set max lock count.\n",
@@ -607,8 +611,8 @@
 
     if (count != 1)
     {
-	fprintf(stderr, "%s: Exactly one of the -C, -d, -f, -F, -P, -l, -R or -w flags "
-		"must be present.\n", progname);
+	usage();
+	fprintf(stderr, "%s: Exactly one of the file or directory commands must be present.\n", progname);
 	exit(EX_ERROR);
     }