diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-02-25 12:58:56 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-02-25 12:58:56 +1300 |
commit | 7789b602c84ad611a0590f42a542575c54ce50d2 (patch) | |
tree | a5daa267ceb3d3fde059e5b203bc12725f7fd833 /doc-src | |
parent | 986a41d1806eba2ad3d3746c9163cff9502b9482 (diff) | |
parent | de08810a4748276cc09ffde19536945525f7c0be (diff) | |
download | mitmproxy-7789b602c84ad611a0590f42a542575c54ce50d2.tar.gz mitmproxy-7789b602c84ad611a0590f42a542575c54ce50d2.tar.bz2 mitmproxy-7789b602c84ad611a0590f42a542575c54ce50d2.zip |
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'doc-src')
-rw-r--r-- | doc-src/mitmproxy.html | 2 | ||||
-rw-r--r-- | doc-src/tutorials/30second.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc-src/mitmproxy.html b/doc-src/mitmproxy.html index d1d51da3..3910aa2d 100644 --- a/doc-src/mitmproxy.html +++ b/doc-src/mitmproxy.html @@ -105,5 +105,5 @@ and _m_ for "method" to change the HTTP request method. <img src="@!urlTo('mitmproxy-intercept-result.png')!@"/> Finally, we press _a_ to accept the modified request, which is then sent on to -the server. In this case, we changed the request from an HTTP GET to to +the server. In this case, we changed the request from an HTTP GET to OPTIONS, and Google's server has responded with a 405 "Method not allowed". diff --git a/doc-src/tutorials/30second.html b/doc-src/tutorials/30second.html index cfeca49a..fe9581c5 100644 --- a/doc-src/tutorials/30second.html +++ b/doc-src/tutorials/30second.html @@ -49,13 +49,13 @@ voila! - totally hands-free wireless network startup. We might also want to prune requests that download CSS, JS, images and so forth. These add only a few moments to the time it takes to replay, but they're -not really needed and I somehow feel compelled trim them anyway. So, we fire up +not really needed and I somehow feel compelled to trim them anyway. So, we fire up the mitmproxy console tool on our serialized conversation, like so: <pre class="terminal"> -> mitmproxy wireless-login +> mitmproxy -r wireless-login </pre> We can now go through and manually delete (using the __d__ keyboard shortcut) -everything we want to trim. When we're done, we use __S__ to save the +everything we want to trim. When we're done, we use __w__ to save the conversation back to the file. |