aboutsummaryrefslogtreecommitdiffstats
path: root/doc-src
diff options
context:
space:
mode:
authorJim Shaver <dcypherd@gmail.com>2015-04-11 19:02:37 -0400
committerJim Shaver <dcypherd@gmail.com>2015-04-11 19:02:37 -0400
commit5b6fb64e60bee85f764e60881d67d0d53164f8d5 (patch)
tree0bd7024900de99bd7999304d59c404797c2c5013 /doc-src
parent4731c1bb795d2afd20ded0a99f91e03216764ec5 (diff)
downloadmitmproxy-5b6fb64e60bee85f764e60881d67d0d53164f8d5.tar.gz
mitmproxy-5b6fb64e60bee85f764e60881d67d0d53164f8d5.tar.bz2
mitmproxy-5b6fb64e60bee85f764e60881d67d0d53164f8d5.zip
cleaned up Installing from source section.
Diffstat (limited to 'doc-src')
-rw-r--r--doc-src/install.html27
1 files changed, 9 insertions, 18 deletions
diff --git a/doc-src/install.html b/doc-src/install.html
index 246b3c46..e4193542 100644
--- a/doc-src/install.html
+++ b/doc-src/install.html
@@ -1,9 +1,7 @@
## 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 [here](http://www.pip-installer.org/en/latest/installing.html).
-
-If you are looking for a more information on how to install mitmproxy directly from the master branch on GitHub, or are wanting to set up mitmproxy for developement purposes, see the <a href="https://github.com/mitmproxy/mitmproxy/blob/master/README.mkd#hacking">Hacking</a> section of the README on GitHub.
+You can install mitmproxy with pip:
<pre class="terminal">
$ pip install mitmproxy
@@ -16,24 +14,17 @@ content views, do this:
$ pip install "mitmproxy[contentviews]"
</pre>
+If you are looking for a more information on how to install mitmproxy directly from the master branch on GitHub, or are wanting to set up mitmproxy for developement purposes, see the <a href="https://github.com/mitmproxy/mitmproxy/blob/master/README.mkd#hacking">Hacking</a> section of the README on GitHub.
+
## 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).
-
-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
-background terminal, but you can select a palette for a light terminal
-background with the --palette option. You can use the OSX <b>open</b> program
-to create a simple and effective <b>~/.mailcap</b> file to view request and
-response bodies:
+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).
+
+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 background terminal, but you can select a palette for a light terminal background with the --palette option. You can use the OSX <b>open</b> program to create a simple and effective <b>~/.mailcap</b> file to view request and response bodies:
<pre class="terminal">
application/*; /usr/bin/open -Wn %s