[tor-commits] [flashproxy/master] Add port forwarding options to flashproxy-client man page.

[dcf at torproject.org]

commit 009011b6b4d98c7931c12cddd882fb6496e226a8
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Jul 1 00:21:57 2013 -0700

    Add port forwarding options to flashproxy-client man page.
---
 doc/flashproxy-client.1     |   25 +++++++++++++++++++++++--
 doc/flashproxy-client.1.txt |   11 +++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1
index d431a58..5e34131 100644
--- a/doc/flashproxy-client.1
+++ b/doc/flashproxy-client.1
@@ -2,12 +2,12 @@
 .\"     Title: flashproxy-client
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 06/08/2013
+.\"      Date: 07/01/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "FLASHPROXY\-CLIENT" "1" "06/08/2013" "\ \&" "\ \&"
+.TH "FLASHPROXY\-CLIENT" "1" "07/01/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -107,6 +107,27 @@ Register the given address (in case it differs from REMOTE)\&. Implies \-\-regis
 Register using the given comma\-separated list of methods\&. Implies \-\-register\&. Possible methods are: email, http\&. Default is "email,http"\&.
 .RE
 .PP
+\fB\-\-port\-forwarding\fR
+.RS 4
+Attempt to forward
+\fIREMOTE\fR
+port\&.
+.RE
+.PP
+\fB\-\-port\-forwarding\-helper\fR=\fIPROGRAM\fR
+.RS 4
+Use the given PROGRAM to forward ports (default "tor\-fw\-helper")\&. Implies \-\-port\-forwarding\&.
+.RE
+.PP
+\fB\-\-port\-forwarding\-external\fR=\fIPORT\fR
+.RS 4
+Forward the external
+\fIPORT\fR
+to
+\fIREMOTE\fR
+on the local host (default same as REMOTE)\&. Implies \-\-port\-forwarding\&.
+.RE
+.PP
 \fB\-\-unsafe\-logging\fR
 .RS 4
 Don\(cqt scrub IP addresses from logs\&.
diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt
index 8d9a99e..b16695b 100644
--- a/doc/flashproxy-client.1.txt
+++ b/doc/flashproxy-client.1.txt
@@ -79,6 +79,17 @@ OPTIONS
     Register using the given comma-separated list of methods. Implies --register. 
     Possible methods are: email, http. Default is "email,http".
 
+**--port-forwarding**::
+    Attempt to forward __REMOTE__ port.
+
+**--port-forwarding-helper**=__PROGRAM__::
+    Use the given PROGRAM to forward ports (default "tor-fw-helper"). Implies
+    --port-forwarding.
+
+**--port-forwarding-external**=__PORT__::
+    Forward the external __PORT__ to __REMOTE__ on the local host (default same
+    as REMOTE). Implies --port-forwarding.
+
 **--unsafe-logging**::
     Don't scrub IP addresses from logs.