From 05590cf6c272571aa812ace321aa30573f2e125c Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 23 Oct 2014 09:44:47 +1300 Subject: Documentation re-org - No longer using README.md in the rendered documentation. - Rendered doc instrutions are now for the released version of mitmproxy, with dev install instructions in the README.md --- doc-src/install.html | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'doc-src/install.html') diff --git a/doc-src/install.html b/doc-src/install.html index 5d412459..5f1e54fd 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -4,30 +4,11 @@ release or from source - is to use [pip](http://www.pip-installer.org/). If you don't already have pip on your system, you can find installation instructions [here](http://www.pip-installer.org/en/latest/installing.html). - -## Installing the latest release - -A single command will download and install the latest release of mitmproxy, -along with all its dependencies: - 
 pip install mitmproxy
-## Installing from source - -When installing from source, the easiest method is still to use pip. In this -case run: - -
-pip install /path/to/source
-
- -Note that if you're installing current git master, you will also have to -install the current git master of [netlib](http://github.com/mitmproxy/netlib) by -hand. - ## OSX - If you're running a Python interpreter installed with homebrew (or similar), @@ -64,8 +45,3 @@ from source: - libxslt1-dev - - - - - -- cgit v1.2.3 From 32127f80e2bd3ee5b33610300d11abafc9c6e3ae Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 23 Oct 2014 15:43:06 +1300 Subject: More refactoring of installation docs - Make it clear that README.md only has the hacking installation instructions - Beef up install.html --- doc-src/install.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'doc-src/install.html') diff --git a/doc-src/install.html b/doc-src/install.html index 5f1e54fd..8a76e3ae 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -1,4 +1,8 @@ + + +## Installing from source + The preferred way to install mitmproxy - whether you're installing the latest release or from source - is to use [pip](http://www.pip-installer.org/). If you don't already have pip on your system, you can find installation instructions @@ -8,14 +12,24 @@ don't already have pip on your system, you can find installation instructions pip install mitmproxy +If you also want to install the optional packages AMF, protobuf and CSS +content views, do this: + +
+pip install "mitmproxy[contentviews]"
+
+ ## OSX +The easiest way to get up and running on OSX is to download the pre-built +binary packages from [mitmproxy.org](http://mitmproxy.org). If you still want +to install using pip, there are a few things to keep in mind: + - If you're running a Python interpreter installed with homebrew (or similar), you may have to install some dependencies by hand. - Make sure that XCode is installed from the App Store, and that the command-line tools have been downloaded (XCode/Preferences/Downloads). -- Now use __pip__ to do the installation, as above. There are a few bits of customization you might want to do to make mitmproxy comfortable to use on OSX. The default color scheme is optimized for a dark -- cgit v1.2.3 From e732771c1ca354ef7b895da4088e727573476e34 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 5 Nov 2014 09:57:09 +1300 Subject: We don't need requests for mitmproxy --- doc-src/install.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc-src/install.html') diff --git a/doc-src/install.html b/doc-src/install.html index 8a76e3ae..682e317e 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -1,6 +1,4 @@ - - ## Installing from source The preferred way to install mitmproxy - whether you're installing the latest -- cgit v1.2.3