[tor-commits] [meek/master] --url and --front options are no longer usual.

[dcf at torproject.org]

commit e5c3a57280c8599a61f4a209309031cf0534a964
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Jan 17 01:20:24 2019 -0700

    --url and --front options are no longer usual.
    
    As opposed to url= and front= SOCKS args.
---
 doc/meek-client.1     | 2 +-
 doc/meek-client.1.txt | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/meek-client.1 b/doc/meek-client.1
index bd9b49f..c805eed 100644
--- a/doc/meek-client.1
+++ b/doc/meek-client.1
@@ -34,7 +34,7 @@ meek-client \- The meek client transport plugin
 \fBmeek\-client\fR [\fIOPTIONS\fR]
 .SH "DESCRIPTION"
 .sp
-meek\-client is a transport plugin for Tor that encodes a stream as a sequence of HTTP requests and responses\&. It is usually run with the \fB\-\-url\fR and \fB\-\-front\fR options\&. The \fB\-\-url\fR option controls what URL requests are made to; the web server at that URL should be configured to forward requests to a meek\-server somewhere\&. The \fB\-\-front\fR option is for domain name camouflage: The domain name in the URL is replaced by the front domain before the request is made, but the Host header inside the HTTP request still points to the original domain\&. The idea is to front through a domain that is not blocked to a domain that is blocked\&.
+meek\-client is a transport plugin for Tor that encodes a stream as a sequence of HTTP requests and responses\&. It has a \fBurl\fR option to control what destination server requests are directed to, and a \fBfront\fR option for domain name camouflage: The domain name in the URL is replaced by the front domain before the request is made, but the Host header inside the HTTP request still points to the original domain\&. The idea is to front through a domain that is not blocked to a domain that is blocked\&.
 .sp
 Configuration for meek\-client usually appears in a torrc file\&. Most user configuration can happen either through SOCKS args (i\&.e\&., args on a Bridge line) or through command line options\&. SOCKS args take precedence per\-connection over command line options\&. For example, this configuration using SOCKS args:
 .sp
diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt
index 47c9c46..efbca1b 100644
--- a/doc/meek-client.1.txt
+++ b/doc/meek-client.1.txt
@@ -16,11 +16,9 @@ SYNOPSIS
 DESCRIPTION
 -----------
 meek-client is a transport plugin for Tor that encodes a stream as a
-sequence of HTTP requests and responses. It is usually run with the
-**--url** and **--front** options. The **--url** option controls what
-URL requests are made to; the web server at that URL should be
-configured to forward requests to a meek-server somewhere. The
-**--front** option is for domain name camouflage: The domain name in the
+sequence of HTTP requests and responses. It has a **url** option to
+control what destination server requests are directed to, and a
+**front** option for domain name camouflage: The domain name in the
 URL is replaced by the front domain before the request is made, but the
 Host header inside the HTTP request still points to the original domain.
 The idea is to front through a domain that is not blocked to a domain