Fixed english and made each OS consistent

This commit is contained in:
Jim Shaver
2015-04-11 17:21:43 -04:00
parent fb0e2bf1f9
commit 1a5f0e944e
2 changed files with 6 additions and 12 deletions

View File

@@ -6,14 +6,14 @@ The preferred way to install mitmproxy - whether you're installing the latest re
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.
<pre class="terminal">
$ sudo pip install mitmproxy
$ pip install mitmproxy
</pre>
If you also want to install the optional packages AMF, protobuf and CSS
content views, do this:
<pre class="terminal">
$ sudo pip install "mitmproxy[contentviews]"
$ pip install "mitmproxy[contentviews]"
</pre>
@@ -42,6 +42,7 @@ image/*; /usr/bin/open -Wn %s
video/*; /usr/bin/open -Wn %s
</pre>
From now on you can run mitmproxy, mitmweb or mitmdump from a terminal.
## Ubuntu
@@ -53,10 +54,11 @@ $ sudo apt-get python-pip python-dev libffi-dev libssl-dev libxml2-dev libxslt1-
$ sudo pip install mitmproxy
</pre>
From now on you can run mitmproxy, mitmweb or mitmdump from a terminal.
## Windows
mitmweb and mitmdump are the only parts of mitmproxy that work on Windows.
Please note that mitmweb and mitmdump are the only components of mitmproxy that work on Windows.
Install the latest version of Python 2 from the <a href="https://www.python.org/downloads/windows/">Python website</a>. The Windows MSI installer is fairly straight forward and even includes pip as long as you are installing a version of Python 2 after 2.7.9. One option you should change during installation is "Add python.exe to Path". This will make it easier to run Python.
<img src="@!urlTo('winpythoninstaller.jpg')!@"/>
@@ -67,13 +69,5 @@ Now log out of Windows and back in to finish having Python added to your PATH.
C:\> pip install mitmproxy
</pre>
From that point you just run mitmweb or mitmdump from the Command Prompt
<pre class="terminal">
C:\> mitmweb
</pre>
or
<pre class="terminal">
C:\> mitmdump
</pre>
From now on you can just run mitmweb or mitmdump from the Command Prompt.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB