aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-19 15:11:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-19 15:11:47 -0400
commit60d14421363bdbeee337ba69b21640058a26a6bd (patch)
tree8f4b05a22d20d029b4e51c56f20c04691d970751 /doc
parent8d29866bec821e188a411f78b8112d2097ed106c (diff)
parent6fe4e24645e820167322886f12d27e5e161e9228 (diff)
downloadtor-60d14421363bdbeee337ba69b21640058a26a6bd.tar
tor-60d14421363bdbeee337ba69b21640058a26a6bd.tar.gz
Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
Diffstat (limited to 'doc')
-rw-r--r--doc/tor-fw-helper.1.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt
index cf769d965..1c103d925 100644
--- a/doc/tor-fw-helper.1.txt
+++ b/doc/tor-fw-helper.1.txt
@@ -14,9 +14,8 @@ 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_]
+**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip]
+ [-p __external port__:__internal_port__]
DESCRIPTION
-----------
@@ -31,18 +30,19 @@ OPTIONS
**-h** or **--help**::
Display help text and exit.
-**-v**::
+**-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
**-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
----