aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
diff options
context:
space:
mode:
authorRouli <rouli.net@gmail.com>2013-02-28 13:28:57 +0200
committerRouli <rouli.net@gmail.com>2013-02-28 13:28:57 +0200
commitb6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (patch)
treea939022f9bbafea95d1d2e88e141b6cceefebdd2 /doc-src
parent35f36481b9f9a8050e0316600be168316b60d05e (diff)
parentb077189dd5230b6c440a200d867c70c6ce031b66 (diff)
downloadmitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.gz
mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.tar.bz2
mitmproxy-b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc-src')
-rw-r--r--doc-src/howmitmproxy.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc-src/howmitmproxy.html b/doc-src/howmitmproxy.html
index 6ea723cd..94c895d7 100644
--- a/doc-src/howmitmproxy.html
+++ b/doc-src/howmitmproxy.html
@@ -71,7 +71,7 @@ flow of requests and responses are completely opaque to the proxy.
## The MITM in mitmproxy
-This is where mitmproxy's fundamental trick comes in to play. The MITM in its
+This is where mitmproxy's fundamental trick comes into play. The MITM in its
name stands for Man-In-The-Middle - a reference to the process we use to
intercept and interfere with these theoretially opaque data streams. The basic
idea is to pretend to be the server to the client, and pretend to be the client