From cf7404cfe0579483e2478c816ca883048ad1ece1 Mon Sep 17 00:00:00 2001 From: Gabriel Kirkpatrick Date: Fri, 28 Nov 2014 12:36:31 -0500 Subject: [PATCH 1/2] Changed argument name from confdir to cadir in flowbasic example --- examples/flowbasic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/flowbasic b/examples/flowbasic index 41402b0cc..c71debc93 100755 --- a/examples/flowbasic +++ b/examples/flowbasic @@ -36,7 +36,7 @@ class MyMaster(flow.FlowMaster): config = proxy.ProxyConfig( port=8080, - confdir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file. + cadir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file. ) state = flow.State() server = ProxyServer(config) From 3b03758ef8b8650ccc9449a7507f184059859afa Mon Sep 17 00:00:00 2001 From: Steve Phillips Date: Sat, 29 Nov 2014 04:13:29 -0800 Subject: [PATCH 2/2] README: Fixed double-quote and whitespace issues --- README.mkd | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.mkd b/README.mkd index ccc09138b..bc18cb488 100644 --- a/README.mkd +++ b/README.mkd @@ -72,8 +72,7 @@ This installs the latest GitHub versions of mitmproxy, netlib and pathod into `m The test suite requires the `dev` extra requirements listed in [setup.py](https://github.com/mitmproxy/mitmproxy/blob/master/setup.py) and [pathod](http://pathod.net), version matching mitmproxy. Install these with: -` -pip install "mitmproxy[dev]""` +`pip install "mitmproxy[dev]"` Please ensure that all patches are accompanied by matching changes in the test @@ -85,8 +84,3 @@ suite. The project maintains 100% test coverage. Rendering the documentation requires [countershape](http://github.com/cortesi/countershape). After installation, you can render the documentation to the doc like this: `cshape doc-src doc` - - - - -