aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-05-16 10:07:03 +1200
committerAldo Cortesi <aldo@corte.si>2018-05-16 10:07:03 +1200
commit17dd7e2bd662c3d4b5e670834ded51547cc454ed (patch)
treeb953b27bdd7e7dcb082e049e06a5dfefc8122d71 /docs
parenta38497ac36aa72f0e431205d9c2b0394368d0810 (diff)
downloadmitmproxy-17dd7e2bd662c3d4b5e670834ded51547cc454ed.tar.gz
mitmproxy-17dd7e2bd662c3d4b5e670834ded51547cc454ed.tar.bz2
mitmproxy-17dd7e2bd662c3d4b5e670834ded51547cc454ed.zip
docs: installation, WSL
Diffstat (limited to 'docs')
-rw-r--r--docs/src/content/concepts-modes.md3
-rw-r--r--docs/src/content/overview-installation.md17
2 files changed, 14 insertions, 6 deletions
diff --git a/docs/src/content/concepts-modes.md b/docs/src/content/concepts-modes.md
index 7a0b835a..ea961cab 100644
--- a/docs/src/content/concepts-modes.md
+++ b/docs/src/content/concepts-modes.md
@@ -213,3 +213,6 @@ tests).
## SOCKS Proxy
+
+
+
diff --git a/docs/src/content/overview-installation.md b/docs/src/content/overview-installation.md
index 62762db4..87355d53 100644
--- a/docs/src/content/overview-installation.md
+++ b/docs/src/content/overview-installation.md
@@ -36,15 +36,20 @@ the repository maintainers directly for issues with native packages.
## Windows
-The recommended way to install mitmproxy on Windows is to download our
-binary-packages from our
+All the mitmproxy tools are fully supported under WSL (Windows Subsystem for
+Linux). Please follow the [installation instructions for
+WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10), and then
+follow the mitmproxy installation instructions for Linux.
+
+We also distribute native Windows packages for all tools other than the
+mitmproxy console app, which is not supported under native Windows. The
+recommended way to install mitmproxy on Windows is to download the binary
+packages from our
[releases](https://github.com/mitmproxy/mitmproxy/releases/latest) page.
-FIXME: WSL
-
After installation, you'll find shortcuts for mitmweb and mitmdump in the start
menu. Both executables are added to your PATH and can be invoked from the
-command line. The console interface is not supported on native Windows.
+command line.
# Advanced Installation
@@ -54,7 +59,7 @@ command line. The console interface is not supported on native Windows.
For some platforms we provide pre-built binary packages containing ready-to-run
executables. This includes a self-contained Python 3 environment, a recent
OpenSSL that support ALPN and HTTP/2, and other dependencies that would
-otherwise we cumbersome to compile and install.
+otherwise be cumbersome to compile and install.
Dependencies in the binary packages are frozen on release, and can't be updated
in situ. This means that we necessarily capture any bugs or security issues that