commit dcc470015b37c2edda43585eefedc49ff94a6b31 Author: David Fifield <david@bamsoftware.com> Date: Wed Oct 9 23:56:21 2013 -0700 Regen man pages. --- doc/flashproxy-client.1 | 49 ++++++++++++++++++++++++------------------ doc/flashproxy-reg-appspot.1 | 21 +++++++++++++++--- doc/flashproxy-reg-email.1 | 11 +++++++--- doc/flashproxy-reg-http.1 | 15 ++++++++----- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index 8de4e0e..27e6b5f 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: 07/01/2013 +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-CLIENT" "1" "07/01/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-CLIENT" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -78,35 +78,20 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) Display a help message and exit\&. .RE .PP -\fB\-l\fR, \fB\-\-log\fR \fIFILENAME\fR +\fB\-l\fR, \fB\-\-log\fR=\fIFILENAME\fR .RS 4 Write log to \fIFILENAME\fR (default is stdout)\&. .RE .PP -\fB\-\-pidfile\fR \fIFILENAME\fR +\fB\-\-pidfile\fR=\fIFILENAME\fR .RS 4 Write PID to \fIFILENAME\fR after daemonizing\&. .RE .PP -\fB\-r\fR, \fB\-\-register\fR -.RS 4 -Register with the facilitator\&. -.RE -.PP -\fB\-\-register\-addr\fR=\fIADDR\fR -.RS 4 -Register the given address (in case it differs from REMOTE)\&. Implies \-\-register\&. -.RE -.PP -\fB\-\-register\-methods\fR=\fIMETHOD\fR[,\fIMETHOD\fR] -.RS 4 -Register using the given comma\-separated list of methods\&. Implies \-\-register\&. Possible methods are: appspot, email, http\&. Default is "appspot,email,http"\&. -.RE -.PP \fB\-\-port\-forwarding\fR .RS 4 Attempt to forward @@ -116,7 +101,10 @@ port\&. .PP \fB\-\-port\-forwarding\-helper\fR=\fIPROGRAM\fR .RS 4 -Use the given PROGRAM to forward ports (default "tor\-fw\-helper")\&. Implies \-\-port\-forwarding\&. +Use the given +\fIPROGRAM\fR +to forward ports (default "tor\-fw\-helper")\&. Implies +\fB\-\-port\-forwarding\fR\&. .RE .PP \fB\-\-port\-forwarding\-external\fR=\fIPORT\fR @@ -125,7 +113,26 @@ Forward the external \fIPORT\fR to \fIREMOTE\fR -on the local host (default same as REMOTE)\&. Implies \-\-port\-forwarding\&. +on the local host (default same as REMOTE)\&. Implies +\fB\-\-port\-forwarding\fR\&. +.RE +.PP +\fB\-r\fR, \fB\-\-register\fR +.RS 4 +Register with the facilitator\&. +.RE +.PP +\fB\-\-register\-addr\fR=\fIADDR\fR +.RS 4 +Register the given address (in case it differs from +\fIREMOTE\fR)\&. Implies +\fB\-\-register\fR\&. +.RE +.PP +\fB\-\-register\-methods\fR=\fIMETHOD\fR[,\fIMETHOD\fR] +.RS 4 +Register using the given comma\-separated list of methods\&. Implies +\fB\-\-register\fR\&. Possible methods are: appspot, email, http\&. Default is "appspot,email,http"\&. .RE .PP \fB\-\-unsafe\-logging\fR diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 index b195c89..e77394b 100644 --- a/doc/flashproxy-reg-appspot.1 +++ b/doc/flashproxy-reg-appspot.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-appspot .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/31/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-APPSPOT" "1" "05/31/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-APPSPOT" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,6 +41,16 @@ This program uses a trick to talk to App Engine, even though appspot\&.com may b Requires the \fBflashproxy\-reg\-url\fR program\&. .SH "OPTIONS" .PP +\fB\-4\fR +.RS 4 +Name lookups use only IPv4\&. +.RE +.PP +\fB\-6\fR +.RS 4 +Name lookups use only IPv6\&. +.RE +.PP \fB\-\-disable\-pin\fR .RS 4 Don\(cqt check the server\(cqs public key against a list of known pins\&. You can use this if the server\(cqs public key has changed and this program hasn\(cqt been updated yet\&. @@ -55,6 +65,11 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) .RS 4 Display help message and exit\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index ea6729e..1adb60e 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-email .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/31/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "05/31/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -84,6 +84,11 @@ Display help message and exit\&. .RS 4 Use the given SMTP server (default is "gmail\-smtp\-in\&.l\&.google\&.com:25")\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR diff --git a/doc/flashproxy-reg-http.1 b/doc/flashproxy-reg-http.1 index 86640dd..a56d5a0 100644 --- a/doc/flashproxy-reg-http.1 +++ b/doc/flashproxy-reg-http.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-http .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 04/30/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-HTTP" "1" "04/30/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-HTTP" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,15 +47,20 @@ Name lookups use only IPv4\&. Name lookups use only IPv6\&. .RE .PP -\fB\-f\fR, \fB\-\-facilitator\fR +\fB\-f\fR, \fB\-\-facilitator\fR=\fIURL\fR .RS 4 -Register with the given facilitator (by default "https://fp\-facilitator\&.org/")\&. +Register with the given facilitator (default "https://fp\-facilitator\&.org/")\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR .RS 4 Display help message and exit\&. .RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR