From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Sep 2013 22:33:52 +0000 (+0100)
Subject: turn all usages into angle brackets
X-Git-Tag: test~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?p=d.git;a=commitdiff_plain;h=e8a301761f4aab99c0e75ec2ffe9e6c8c7c2e398

turn all usages into angle brackets
---

diff --git a/service b/service
index 9739cbc..2774f49 100755
--- a/service
+++ b/service
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 our $usage1 = <<'END';
-usage: ../fyvzl [OPTIONS DATABASE-FILE ACTION ARG
+usage: ../fyvzl [<options>] <database-file> <action> <arg>...
 options
   -l<minrandlength>   (for create/choose, number of letters)
   -m<maxperuser>
@@ -11,20 +11,20 @@ options
 END
 our $usage2 = <<'END';
 actions
-  create [GENOPTS] [REDIRECT] [#COMMENT]  (default for REDIRECT is username)
-  choose [GENOPTS] [REDIRECT] [#COMMENT]  (generate and interactively allocate)
-  update ADDR [REDIRECT] [#COMMENT]
-  show ADDR
+  create [<genopts>] [<redirect>] [#<comment>]  (default redirect is username)
+  choose [<genopts>] [<redirect>] [#<comment>]  (interactively allocate)
+  update <addr> [<redirect>] [#<comment>]
+  show <addr>
   list
   list-actions
-empty string for REDIRECT means reject
+empty string for redirect means reject
 END
 our $usage3 = <<'END';
 privileged actions
-  list-user USER
-  insert-exact ADDR USER REDIRECT COMMENT
-  donate ADDR USER
-  enable-user|disable-user USER
+  list-user <user>
+  insert-exact <addr> <user> <redirect> <comment>
+  donate <addr> <user>
+  enable-user|disable-user <user>
 END
 #/
 
@@ -421,9 +421,10 @@ if (defined $ENV{'USERV_USER'}) {
 }
 
 $usage2 .= defined $dom
-    ? "ADDR may be a local part, implicitly qualified with \@$dom\n"
-    : "ADDR must be a local part (only)\n";
-$usage2 .= "REDIRECT is implicitly qualified with \@$qualdom if it has no \@\n"
+    ? "addr may be a local part, implicitly qualified with \@$dom\n"
+    : "addr must be a local part (only)\n";
+$usage2 .= "redirect is implicitly qualified with \@$qualdom".
+    " if it has no \@\n"
     if defined $qualdom;
 
 $dbh = DBI->connect("dbi:SQLite:dbname=$dbfile","","",