[tor-commits] [meek/master] Regen man pages.

[dcf at torproject.org]

commit 617129e68b7bd162e416cb1bf6c44703d28e627d
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Sep 25 02:24:33 2014 -0700

    Regen man pages.
---
 doc/meek-client.1 |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/meek-client.1 b/doc/meek-client.1
index f5e7702..78ca4fe 100644
--- a/doc/meek-client.1
+++ b/doc/meek-client.1
@@ -2,12 +2,12 @@
 .\"     Title: meek-client
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 08/10/2014
+.\"      Date: 09/25/2014
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MEEK\-CLIENT" "1" "08/10/2014" "\ \&" "\ \&"
+.TH "MEEK\-CLIENT" "1" "09/25/2014" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -80,7 +80,7 @@ Socks5Proxy localhost:1080
 .RE
 .\}
 .sp
-or, equivalently, using the \fB\-\-proxy\fR command\-line option or \fBproxy\fR SOCKS arg\&.
+or, equivalently, using the \fB\-\-proxy\fR command\-line option\&.
 .sp
 When the \fB\-\-helper\fR option is used, you can use any type of proxy: HTTP or SOCKS\&. Without \fB\-\-helper\fR, you can only use an HTTP proxy\&.
 .SH "OPTIONS"
@@ -103,9 +103,7 @@ Address of HTTP helper browser extension\&. For example,
 URL of upstream proxy\&. For example,
 \fB\-\-proxy=http://localhost:8080/\fR,
 \fB\-\-proxy=socks4a://localhost:1080\fR, or
-\fB\-\-proxy=socks5://localhost:1080\fR\&. The
-\fBproxy\fR
-SOCKS arg overrides the command line\&. You would normally control the proxy using the
+\fB\-\-proxy=socks5://localhost:1080\fR\&. You would normally control the proxy using the
 \fBHTTPSProxy\fR,
 \fBSocks4Proxy\fR, or
 \fBSocks5Proxy\fR