aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-11 17:57:27 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-11 17:57:27 -0400
commit8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a (patch)
treea402a282a0d0fa227b41d63d8b4b3c4e13dc5f9b
parent051b1e8ac4114fb23904cdf8dead72d585904e0a (diff)
downloadtor-8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a.tar
tor-8c211c3cdae1c6cb0f2d004f8dfaf15569b7501a.tar.gz
Fix option names in tor-fw-helper manpage
fix for bug 7768
-rw-r--r--changes/bug77683
-rw-r--r--doc/tor-fw-helper.1.txt10
2 files changed, 8 insertions, 5 deletions
diff --git a/changes/bug7768 b/changes/bug7768
new file mode 100644
index 000000000..f523b5b77
--- /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 cf769d965..f51ffc4bd 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
----