From 8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 11 Mar 2013 17:57:27 -0400 Subject: [PATCH 1/3] Fix option names in tor-fw-helper manpage fix for bug 7768 --- changes/bug7768 | 3 +++ doc/tor-fw-helper.1.txt | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 changes/bug7768 diff --git a/changes/bug7768 b/changes/bug7768 new file mode 100644 index 0000000000..f523b5b771 --- /dev/null +++ b/changes/bug7768 @@ -0,0 +1,3 @@ + o Documentation fixes: + - Update tor-fw-helper.1.txt to describe its options with their + correct names. Fixes bug 7768. diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index cf769d9654..f51ffc4bd8 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -15,8 +15,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- **tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] - -i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_] - [-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_] + [-p __external port__:__internal_port__] DESCRIPTION ----------- @@ -31,7 +30,7 @@ OPTIONS **-h** or **--help**:: Display help text and exit. -**-v**:: +**-v** or **--verbose**:: Display verbose output. **-T** or **--test**:: @@ -41,8 +40,9 @@ OPTIONS **-g** or **--fetch-public-ip**:: Fetch the the public ip address for each supported NAT helper method. -**-p** or **--forward-port** __external_port__:__internal_port__:: - Forward external_port to internal_port. +**-p** or **--port** __external_port__:__internal_port__:: + Forward external_port to internal_port. This option can appear + more than once. BUGS ---- From 03efe54027e214be51f5cb4bafcbbd57422da7a1 Mon Sep 17 00:00:00 2001 From: David Fifield Date: Wed, 13 Mar 2013 00:43:21 -0700 Subject: [PATCH 2/3] 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 f523b5b771..e3f9600afb 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 d92445e08f..488fe67419 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 ([]:])\n"); From 6fe4e24645e820167322886f12d27e5e161e9228 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 19 Mar 2013 15:11:34 -0400 Subject: [PATCH 3/3] Use --test-commandline name in tor-fw-helper manpage --- doc/tor-fw-helper.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt index f51ffc4bd8..1c103d9250 100644 --- a/doc/tor-fw-helper.1.txt +++ b/doc/tor-fw-helper.1.txt @@ -14,7 +14,7 @@ tor-fw-helper - Manage upstream firewall/NAT devices SYNOPSIS -------- -**tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip] +**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip] [-p __external port__:__internal_port__] DESCRIPTION @@ -33,7 +33,7 @@ OPTIONS **-v** or **--verbose**:: Display verbose output. -**-T** or **--test**:: +**-T** or **--test-commandline**:: Display test information and print the test information in tor-fw-helper.log