From f12510d9794c155657e80864529e0198872e7d7d Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 30 Mar 2011 12:05:50 +1300 Subject: [PATCH] Spell-check docs, setup.py fixes, add missing files to manifest. --- MANIFEST.in | 4 ++++ README.mkd | 2 +- doc-src/anticache.html | 2 +- doc-src/filters.html | 2 +- doc-src/interception.html | 4 ++-- doc-src/ssl.html | 2 +- doc-src/sticky.html | 2 +- setup.py | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index beffe8856..d0c96b423 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,8 @@ include LICENSE +include CHANGELOG +include CONTRIBUTORS +include README.mkd +recursive-include examples * recursive-include doc * recursive-include test * recursive-include libmproxy/resources * diff --git a/README.mkd b/README.mkd index d383751c4..764c5a36a 100644 --- a/README.mkd +++ b/README.mkd @@ -1,3 +1,4 @@ + __mitmproxy__ is an SSL-capable, intercepting HTTP proxy. It provides a console interface that allows traffic flows to be inspected and edited on the fly. @@ -35,7 +36,6 @@ Source is hosted on github: Requirements ------------ - * [Python](http://www.python.org) 2.6.x or 2.7.x. * [openssl](http://www.openssl.org/). Installed by default on most systems. * [urwid](http://excess.org/urwid/) version 0.9.8 or newer. diff --git a/doc-src/anticache.html b/doc-src/anticache.html index ceeffe2ec..a4d76e479 100644 --- a/doc-src/anticache.html +++ b/doc-src/anticache.html @@ -2,6 +2,6 @@ When the __anticache__ option is passed to mitmproxy, it removes headers (__if-none-match__ and __if-modified-since__) that might elicit a 304-not-modified response from the server. This is useful when you want to make -sure you capture an HTTP extchange in its totality, and during [client +sure you capture an HTTP exchange in its totality, and during [client replay](@!urlTo("clientreplay.html")!@). diff --git a/doc-src/filters.html b/doc-src/filters.html index b71207fcd..b5e3ebf8a 100644 --- a/doc-src/filters.html +++ b/doc-src/filters.html @@ -20,7 +20,7 @@ Filter expressions consist of the following operators: Examples ======== -Url containing "google.com": +URL containing "google.com": google\.com diff --git a/doc-src/interception.html b/doc-src/interception.html index cf5b7439a..2f961b5f7 100644 --- a/doc-src/interception.html +++ b/doc-src/interception.html @@ -14,7 +14,7 @@ pattern tells __mitmproxy__ to intercept all requests. For complete filter syntax, see the [Filter expressions](@!urlTo("filters.html")!@) section of this document, or the built-in help function in __mitmproxy__. -### 2: Intercepted conenctions are indicated with a red exclamation mark: +### 2: Intercepted connections are indicated with a red exclamation mark: @@ -22,7 +22,7 @@ document, or the built-in help function in __mitmproxy__. -In this case, we viewd the request by selecting it, pressed __e__ for "edit" +In this case, we viewed the request by selecting it, pressed __e__ for "edit" and __m__ for "method" to change the HTTP request method. ### 4: Accept the intercept to continue diff --git a/doc-src/ssl.html b/doc-src/ssl.html index a8004082b..7ee9438e3 100644 --- a/doc-src/ssl.html +++ b/doc-src/ssl.html @@ -27,7 +27,7 @@ a browser, just accepting the bogus SSL cert manually is not too much trouble, but there are a number of cases where you will want to configure your testing system or browser to trust the __mitmproxy__ CA as a signing root authority: -- If you are testing non-browser software that checks SSL cert validiy using +- If you are testing non-browser software that checks SSL cert validity using the system certificate store. - You are testing an app that makes non-interactive (JSONP, script src, etc.) requests to SSL resources. Another workaround in this case is to manually visit diff --git a/doc-src/sticky.html b/doc-src/sticky.html index 32ccdd2d1..b2636890f 100644 --- a/doc-src/sticky.html +++ b/doc-src/sticky.html @@ -17,7 +17,7 @@ with the secured resources. ## Sticky auth -The __stickyauth__ option is analagous to the __stickycookie__ option, in that +The __stickyauth__ option is analogous to the __stickycookie__ option, in that HTTP __Authorization__ headers are simply replayed to the server once they have been seen. This is enough to allow you to access a server resource using HTTP Basic authentication through the proxy. Note that __mitmproxy__ doesn't (yet) diff --git a/setup.py b/setup.py index de4a3e963..92560189f 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ setup( long_description = long_description, author = "Aldo Cortesi", author_email = "aldo@corte.si", - url = "http://corte.si/software", + url = "http://mitmproxy.org", packages = packages, package_data = package_data, scripts = ["mitmproxy", "mitmdump"],