[tor-commits] [tor/release-0.2.4] Use option name --test-commandline in tor-fw-helper.

[arma at torproject.org]

commit 03efe54027e214be51f5cb4bafcbbd57422da7a1
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Mar 13 00:43:21 2013 -0700

    Use option name --test-commandline in tor-fw-helper.
    
    It was previously --Test in the help output and --test-commandline in
    the getopt call. The man page already had --test.
    
      (Originally by David, who resolved the tie in favor of "--test"; I
       chose --test-commandline" instead so that nothing that depended
       on it could break. -Nick)
---
 changes/bug7768                         |    4 ++--
 src/tools/tor-fw-helper/tor-fw-helper.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/changes/bug7768 b/changes/bug7768
index f523b5b..e3f9600 100644
--- a/changes/bug7768
+++ b/changes/bug7768
@@ -1,3 +1,3 @@
   o Documentation fixes:
-    - Update tor-fw-helper.1.txt to describe its options with their
-      correct names. Fixes bug 7768.
+    - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
+      names match. Fixes bug 7768.
diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c
index d92445e..488fe67 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper.c
@@ -97,7 +97,7 @@ usage(void)
 {
   fprintf(stderr, "tor-fw-helper usage:\n"
           " [-h|--help]\n"
-          " [-T|--Test]\n"
+          " [-T|--test-commandline]\n"
           " [-v|--verbose]\n"
           " [-g|--fetch-public-ip]\n"
           " [-p|--forward-port ([<external port>]:<internal port>])\n");