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

[dcf at torproject.org]

commit 38e6ebed87aa4a8281c1f2d6ad931a2d911797ec
Author: David Fifield <david at bamsoftware.com>
Date:   Sat May 24 22:56:09 2014 -0700

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

diff --git a/doc/meek-client.1 b/doc/meek-client.1
index 51b31ca..3e9cb5b 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: 05/07/2014
+.\"      Date: 05/24/2014
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MEEK\-CLIEN" "1" "05/07/2014" "\ \&" "\ \&"
+.TH "MEEK\-CLIEN" "1" "05/24/2014" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -80,12 +80,12 @@ Address of HTTP helper browser extension\&. For example,
 \fB\-\-helper 127\&.0\&.0\&.1:7000\fR\&.
 .RE
 .PP
-\fB\-\-http\-proxy\fR=\fIURL\fR
+\fB\-\-proxy\fR=\fIURL\fR
 .RS 4
-URL of HTTP proxy\&. If not given, the proxy URL may be taken from the The
-\fBhttp\-proxy\fR
+URL of upstream proxy\&. The
+\fBproxy\fR
 SOCKS arg overrides the command line\&. For example,
-\fB\-\-http\-proxy=http://localhost:8787/\fR\&.
+\fB\-\-proxy=http://localhost:8787/\fR\&.
 .RE
 .PP
 \fB\-\-log\fR=\fIFILENAME\fR