# 
# 
# patch "usher.txt"
#  from [e148d5bf2c87fd547e893890db79e9b579c9d312]
#    to [7beae98bb3e173b8971df75c2bfefb7d1aced1d8]
# 
============================================================
--- usher.txt	e148d5bf2c87fd547e893890db79e9b579c9d312
+++ usher.txt	7beae98bb3e173b8971df75c2bfefb7d1aced1d8
@@ -13,12 +13,11 @@
 Usage: usher [-l address[:port]] [-a address:port] [-p pidfile] <server-file>
 
 options:
--m   the monotone command, defaults to "mtn"
--l   address and port to listen on, defaults to 0.0.0.0:4691
--a   address and port to listen for admin commands
 -p   a file (deleted on program exit) to record the pid of the usher in
 <server-file>   a file that looks like
   userpass "username" "password"
+  monotone "mtn" "-k" "my_key"
+  adminaddr "127.0.0.1:12345"
 
   server "monotone"
   host "localhost"
@@ -32,6 +31,10 @@
 
 or in general, one block of one or more lines of
   userpass <username> <password>
+and optionally any of
+  monotone <executable> <common argument 1> <common argument 2>
+  adminaddr <address>:<port>
+  listenaddr <address>:<port>
 followed by any number of blocks of a
   server <name>
 line followed by one or more
@@ -41,9 +44,11 @@
 lines, and one of
    remote <address:port>
    local <arguments>
-, with blocks separated by blank lines
+, with blocks separated by blank lines.
 
 "userpass" lines specify who is allowed to use the administrative port.
+If there is no "monotone" line, it defaults to "mtn". If there is no
+"listenaddr" line, it defaults to "0.0.0.0:4691".
 
 A request to server "hostname" will be directed to the
 server at <ip-address>:<port-number>, if that stem is marked as remote,