From 1a5f0e944ee724d39d4814a8414b35f91cfcdf9a Mon Sep 17 00:00:00 2001 From: Jim Shaver Date: Sat, 11 Apr 2015 17:21:43 -0400 Subject: Fixed english and made each OS consistent --- doc-src/install.html | 18 ++++++------------ doc-src/winppythoninstaller.jpg | Bin 46628 -> 0 bytes 2 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 doc-src/winppythoninstaller.jpg (limited to 'doc-src') diff --git a/doc-src/install.html b/doc-src/install.html index 2e9de63b..246b3c46 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -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 Hacking section of the README on GitHub.
-$ sudo pip install mitmproxy
+$ pip install mitmproxy
 
If you also want to install the optional packages AMF, protobuf and CSS content views, do this:
-$ sudo pip install "mitmproxy[contentviews]"
+$ pip install "mitmproxy[contentviews]"
 
@@ -42,6 +42,7 @@ image/*; /usr/bin/open -Wn %s video/*; /usr/bin/open -Wn %s +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 +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 Python website. 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. @@ -67,13 +69,5 @@ Now log out of Windows and back in to finish having Python added to your PATH. C:\> pip install mitmproxy -From that point you just run mitmweb or mitmdump from the Command Prompt - -
-C:\> mitmweb
-
-or -
-C:\> mitmdump
-
+From now on you can just run mitmweb or mitmdump from the Command Prompt. diff --git a/doc-src/winppythoninstaller.jpg b/doc-src/winppythoninstaller.jpg deleted file mode 100644 index 0473c66a..00000000 Binary files a/doc-src/winppythoninstaller.jpg and /dev/null differ -- cgit v1.2.3