commit c002993511952e52a6407823a4d97548e4e5dd0f Author: David Fifield david@bamsoftware.com Date: Wed Oct 9 23:46:45 2013 -0700

Say just "default" in place of "by default". --- doc/flashproxy-reg-http.1.txt | 2 +- doc/flashproxy-reg-url.1.txt | 2 +- facilitator/facilitator | 2 +- facilitator/facilitator-reg | 2 +- facilitator/facilitator-reg-daemon | 2 +- flashproxy-reg-http | 2 +- flashproxy-reg-url | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index 70cc13b..dd6779c 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -28,7 +28,7 @@ OPTIONS Name lookups use only IPv6.

**-f**, **--facilitator**:: - Register with the given facilitator (by default "https://fp-facilitator.org/"). + Register with the given facilitator (default "https://fp-facilitator.org/").

**-h**, **--help**:: Display help message and exit. diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt index 8102246..e69cd69 100644 --- a/doc/flashproxy-reg-url.1.txt +++ b/doc/flashproxy-reg-url.1.txt @@ -23,7 +23,7 @@ default __PORT__ is 9000. OPTIONS ------- **-f**, **--facilitator**=__URL__:: - Register with the given facilitator (by default "https://fp-facilitator.org/"). + Register with the given facilitator (default "https://fp-facilitator.org/").

**--facilitator-pubkey**=__FILENAME__:: Encrypt registrations to the given PEM-formatted public key (default built-in). diff --git a/facilitator/facilitator b/facilitator/facilitator index 4049dc6..080c2f5 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -51,7 +51,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). -d, --debug don't daemonize, log to stdout. -h, --help show this help. -l, --log FILENAME write log to FILENAME (default "%(log)s"). - -p, --port PORT listen on PORT (by default %(port)d). + -p, --port PORT listen on PORT (default %(port)d). --pidfile FILENAME write PID to FILENAME after daemonizing. --privdrop-user USER switch UID and GID to those of USER. -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use. diff --git a/facilitator/facilitator-reg b/facilitator/facilitator-reg index b24b767..f3d2dc9 100755 --- a/facilitator/facilitator-reg +++ b/facilitator/facilitator-reg @@ -18,7 +18,7 @@ feeds it to a local facilitator-reg-daemon process. Returns 0 if the registration was successful, 1 otherwise.

-h, --help show this help. - -p, --port PORT connect to PORT (by default %(port)d).\ + -p, --port PORT connect to PORT (default %(port)d).\ """ % { "progname": sys.argv[0], "port": DEFAULT_CONNECT_PORT, diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index a053bb2..2cb2904 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -50,7 +50,7 @@ single process. -h, --help show this help. -k, --key=KEYFILE read the private key from KEYFILE (required). -l, --log FILENAME write log to FILENAME (default "%(log)s"). - -p, --port PORT listen on PORT (by default %(port)d). + -p, --port PORT listen on PORT (default %(port)d). --pidfile FILENAME write PID to FILENAME after daemonizing. --privdrop-user USER switch UID and GID to those of USER. --unsafe-logging don't scrub IP addresses from logs.\ diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 8d6a700..f0014d9 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -28,7 +28,7 @@ remote address registered is "%(remote_addr)s". -4 name lookups use only IPv4. -6 name lookups use only IPv6. -f, --facilitator=URL register with the given facilitator - (by default "%(fac_url)s"). + (default "%(fac_url)s"). -h, --help show this help. --unsafe-logging don't scrub IP addresses from logs.\ """ % { diff --git a/flashproxy-reg-url b/flashproxy-reg-url index b30c550..8fdd2f1 100755 --- a/flashproxy-reg-url +++ b/flashproxy-reg-url @@ -40,7 +40,7 @@ REMOTE[:PORT] to be registered with the flash proxy facilitator. The default PORT is %(port)d.

-f, --facilitator=URL register with the given facilitator - (by default "%(fac_url)s"). + (default "%(fac_url)s"). --facilitator-pubkey=FILENAME encrypt registrations to the given PEM-formatted public key (default built-in).