Docs and examples to top level

137 files changed, 4 insertions, 4 deletions

diff --git a/.landscape.yml b/.landscape.yml
index 1cf78412..d4f32733 100644
--- a/.landscape.yml
+++ b/.landscape.yml
@@ -1,6 +1,6 @@
 ignore-paths:
-  - mitmproxy/docs
-  - mitmproxy/examples
+  - docs
+  - examples
   - mitmproxy/mitmproxy/contrib
   - mitmproxy/web
 max-line-length: 140
diff --git a/.travis.yml b/.travis.yml
index 06b31773..5804b5c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
       env: SCOPE="netlib" NO_ALPN=1
     - python: 2.7
       env: DOCS=1
-      script: 'cd mitmproxy/docs && make html'
+      script: 'cd docs && make html'
   allow_failures:
     - python: pypy
 
diff --git a/mitmproxy/docs/.gitignore b/docs/.gitignore
index 69fa449d..69fa449d 100644
--- a/mitmproxy/docs/.gitignore
+++ b/docs/.gitignore
diff --git a/mitmproxy/docs/Makefile b/docs/Makefile
index 74bcda53..74bcda53 100644
--- a/mitmproxy/docs/Makefile
+++ b/docs/Makefile
diff --git a/mitmproxy/docs/_templates/page.html b/docs/_templates/page.html
index 8002396a..8002396a 100644
--- a/mitmproxy/docs/_templates/page.html
+++ b/docs/_templates/page.html
diff --git a/mitmproxy/docs/certinstall-webapp.png b/docs/certinstall-webapp.png
index 10e795cd..10e795cd 100644
--- a/mitmproxy/docs/certinstall-webapp.png
+++ b/docs/certinstall-webapp.png
diff --git a/mitmproxy/docs/certinstall.rst b/docs/certinstall.rst
index 5a8cce64..5a8cce64 100644
--- a/mitmproxy/docs/certinstall.rst
+++ b/docs/certinstall.rst
diff --git a/mitmproxy/docs/conf.py b/docs/conf.py
index 01bcce1b..01bcce1b 100644
--- a/mitmproxy/docs/conf.py
+++ b/docs/conf.py
diff --git a/mitmproxy/docs/config.rst b/docs/config.rst
index 634b8703..634b8703 100644
--- a/mitmproxy/docs/config.rst
+++ b/docs/config.rst
diff --git a/mitmproxy/docs/custom-routing.txt b/docs/custom-routing.txt
index 2ba2281f..2ba2281f 100644
--- a/mitmproxy/docs/custom-routing.txt
+++ b/docs/custom-routing.txt
diff --git a/mitmproxy/docs/dev/addingviews.html b/docs/dev/addingviews.html
index 12623a31..12623a31 100644
--- a/mitmproxy/docs/dev/addingviews.html
+++ b/docs/dev/addingviews.html
diff --git a/mitmproxy/docs/dev/architecture.rst b/docs/dev/architecture.rst
index e7995141..e7995141 100644
--- a/mitmproxy/docs/dev/architecture.rst
+++ b/docs/dev/architecture.rst
diff --git a/mitmproxy/docs/dev/exceptions.rst b/docs/dev/exceptions.rst
index e890476b..e890476b 100644
--- a/mitmproxy/docs/dev/exceptions.rst
+++ b/docs/dev/exceptions.rst
diff --git a/mitmproxy/docs/dev/models.rst b/docs/dev/models.rst
index 7a949941..7a949941 100644
--- a/mitmproxy/docs/dev/models.rst
+++ b/docs/dev/models.rst
diff --git a/mitmproxy/docs/dev/protocols.rst b/docs/dev/protocols.rst
index ceb5c2fd..ceb5c2fd 100644
--- a/mitmproxy/docs/dev/protocols.rst
+++ b/docs/dev/protocols.rst
diff --git a/mitmproxy/docs/dev/proxy.rst b/docs/dev/proxy.rst
index 888fb946..888fb946 100644
--- a/mitmproxy/docs/dev/proxy.rst
+++ b/docs/dev/proxy.rst
diff --git a/mitmproxy/docs/dev/sslkeylogfile.rst b/docs/dev/sslkeylogfile.rst
index 04b86cc4..04b86cc4 100644
--- a/mitmproxy/docs/dev/sslkeylogfile.rst
+++ b/docs/dev/sslkeylogfile.rst
diff --git a/mitmproxy/docs/dev/testing.rst b/docs/dev/testing.rst
index e3b86bf3..e3b86bf3 100644
--- a/mitmproxy/docs/dev/testing.rst
+++ b/docs/dev/testing.rst
diff --git a/mitmproxy/docs/favicon.ico b/docs/favicon.ico
index 3c3b891c..3c3b891c 100644
--- a/mitmproxy/docs/favicon.ico
+++ b/docs/favicon.ico
diff --git a/mitmproxy/docs/features/anticache.rst b/docs/features/anticache.rst
index 65d22bab..65d22bab 100644
--- a/mitmproxy/docs/features/anticache.rst
+++ b/docs/features/anticache.rst
diff --git a/mitmproxy/docs/features/clientreplay.rst b/docs/features/clientreplay.rst
index b0eb6792..b0eb6792 100644
--- a/mitmproxy/docs/features/clientreplay.rst
+++ b/docs/features/clientreplay.rst
diff --git a/mitmproxy/docs/features/filters.rst b/docs/features/filters.rst
index 509b5d6b..509b5d6b 100644
--- a/mitmproxy/docs/features/filters.rst
+++ b/docs/features/filters.rst
diff --git a/mitmproxy/docs/features/passthrough.rst b/docs/features/passthrough.rst
index b7b5df84..b7b5df84 100644
--- a/mitmproxy/docs/features/passthrough.rst
+++ b/docs/features/passthrough.rst
diff --git a/mitmproxy/docs/features/proxyauth.rst b/docs/features/proxyauth.rst
index bfd32fbd..bfd32fbd 100644
--- a/mitmproxy/docs/features/proxyauth.rst
+++ b/docs/features/proxyauth.rst
diff --git a/mitmproxy/docs/features/replacements.rst b/docs/features/replacements.rst
index 8f760866..8f760866 100644
--- a/mitmproxy/docs/features/replacements.rst
+++ b/docs/features/replacements.rst
diff --git a/mitmproxy/docs/features/responsestreaming.rst b/docs/features/responsestreaming.rst
index 8975c1f8..8975c1f8 100644
--- a/mitmproxy/docs/features/responsestreaming.rst
+++ b/docs/features/responsestreaming.rst
diff --git a/mitmproxy/docs/features/reverseproxy.rst b/docs/features/reverseproxy.rst
index 87065e73..87065e73 100644
--- a/mitmproxy/docs/features/reverseproxy.rst
+++ b/docs/features/reverseproxy.rst
diff --git a/mitmproxy/docs/features/serverreplay.rst b/docs/features/serverreplay.rst
index 261a1bd6..261a1bd6 100644
--- a/mitmproxy/docs/features/serverreplay.rst
+++ b/docs/features/serverreplay.rst
diff --git a/mitmproxy/docs/features/setheaders.rst b/docs/features/setheaders.rst
index cbc8b6a5..cbc8b6a5 100644
--- a/mitmproxy/docs/features/setheaders.rst
+++ b/docs/features/setheaders.rst
diff --git a/mitmproxy/docs/features/socksproxy.rst b/docs/features/socksproxy.rst
index 76d4cda9..76d4cda9 100644
--- a/mitmproxy/docs/features/socksproxy.rst
+++ b/docs/features/socksproxy.rst
diff --git a/mitmproxy/docs/features/sticky.rst b/docs/features/sticky.rst
index a79cbe8d..a79cbe8d 100644
--- a/mitmproxy/docs/features/sticky.rst
+++ b/docs/features/sticky.rst
diff --git a/mitmproxy/docs/features/tcpproxy.rst b/docs/features/tcpproxy.rst
index fd0746a2..fd0746a2 100644
--- a/mitmproxy/docs/features/tcpproxy.rst
+++ b/docs/features/tcpproxy.rst
diff --git a/mitmproxy/docs/features/upstreamcerts.rst b/docs/features/upstreamcerts.rst
index af2e2226..af2e2226 100644
--- a/mitmproxy/docs/features/upstreamcerts.rst
+++ b/docs/features/upstreamcerts.rst
diff --git a/mitmproxy/docs/features/upstreamproxy.rst b/docs/features/upstreamproxy.rst
index e06833c2..e06833c2 100644
--- a/mitmproxy/docs/features/upstreamproxy.rst
+++ b/docs/features/upstreamproxy.rst
diff --git a/mitmproxy/docs/howmitmproxy.rst b/docs/howmitmproxy.rst
index b0b187d3..b0b187d3 100644
--- a/mitmproxy/docs/howmitmproxy.rst
+++ b/docs/howmitmproxy.rst
diff --git a/mitmproxy/docs/index.rst b/docs/index.rst
index 4bca07d1..4bca07d1 100644
--- a/mitmproxy/docs/index.rst
+++ b/docs/index.rst
diff --git a/mitmproxy/docs/install.rst b/docs/install.rst
index 3300807b..3300807b 100644
--- a/mitmproxy/docs/install.rst
+++ b/docs/install.rst
diff --git a/mitmproxy/docs/introduction.rst b/docs/introduction.rst
index 058f39f9..058f39f9 100644
--- a/mitmproxy/docs/introduction.rst
+++ b/docs/introduction.rst
diff --git a/mitmproxy/docs/mitmdump.rst b/docs/mitmdump.rst
index d9b4a26b..d9b4a26b 100644
--- a/mitmproxy/docs/mitmdump.rst
+++ b/docs/mitmdump.rst
diff --git a/mitmproxy/docs/mitmproxy-docs.png b/docs/mitmproxy-docs.png
index 273fb8db..273fb8db 100644
--- a/mitmproxy/docs/mitmproxy-docs.png
+++ b/docs/mitmproxy-docs.png
diff --git a/mitmproxy/docs/mitmproxy-long.png b/docs/mitmproxy-long.png
index f9397d1e..f9397d1e 100644
--- a/mitmproxy/docs/mitmproxy-long.png
+++ b/docs/mitmproxy-long.png
diff --git a/mitmproxy/docs/mitmproxy.rst b/docs/mitmproxy.rst
index fa3b57c7..fa3b57c7 100644
--- a/mitmproxy/docs/mitmproxy.rst
+++ b/docs/mitmproxy.rst
diff --git a/mitmproxy/docs/modes.rst b/docs/modes.rst
index 2c87b2a3..2c87b2a3 100644
--- a/mitmproxy/docs/modes.rst
+++ b/docs/modes.rst
diff --git a/mitmproxy/docs/schematics/_explicit.graffle/data.plist b/docs/schematics/_explicit.graffle/data.plist
index bc5ef104..bc5ef104 100644
--- a/mitmproxy/docs/schematics/_explicit.graffle/data.plist
+++ b/docs/schematics/_explicit.graffle/data.plist
diff --git a/mitmproxy/docs/schematics/_explicit.graffle/image3.icns b/docs/schematics/_explicit.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/mitmproxy/docs/schematics/_explicit.graffle/image3.icns
+++ b/docs/schematics/_explicit.graffle/image3.icns
diff --git a/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff b/docs/schematics/_explicit.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff
+++ b/docs/schematics/_explicit.graffle/image6.tiff
diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist b/docs/schematics/_explicit_https.graffle/data.plist
index 306630a0..306630a0 100644
--- a/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist
+++ b/docs/schematics/_explicit_https.graffle/data.plist
diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns b/docs/schematics/_explicit_https.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns
+++ b/docs/schematics/_explicit_https.graffle/image3.icns
diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff b/docs/schematics/_explicit_https.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff
+++ b/docs/schematics/_explicit_https.graffle/image6.tiff
diff --git a/mitmproxy/docs/schematics/_transparent.graffle/data.plist b/docs/schematics/_transparent.graffle/data.plist
index 722b4a44..722b4a44 100644
--- a/mitmproxy/docs/schematics/_transparent.graffle/data.plist
+++ b/docs/schematics/_transparent.graffle/data.plist
diff --git a/mitmproxy/docs/schematics/_transparent.graffle/image3.icns b/docs/schematics/_transparent.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/mitmproxy/docs/schematics/_transparent.graffle/image3.icns
+++ b/docs/schematics/_transparent.graffle/image3.icns
diff --git a/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff b/docs/schematics/_transparent.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff
+++ b/docs/schematics/_transparent.graffle/image6.tiff
diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist b/docs/schematics/_transparent_https.graffle/data.plist
index 9c1395d7..9c1395d7 100644
--- a/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist
+++ b/docs/schematics/_transparent_https.graffle/data.plist
diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns b/docs/schematics/_transparent_https.graffle/image3.icns
index 964df4b8..964df4b8 100644
--- a/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns
+++ b/docs/schematics/_transparent_https.graffle/image3.icns
diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff b/docs/schematics/_transparent_https.graffle/image6.tiff
index bd6ed534..bd6ed534 100644
--- a/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff
+++ b/docs/schematics/_transparent_https.graffle/image6.tiff
diff --git a/mitmproxy/docs/schematics/architecture.pdf b/docs/schematics/architecture.pdf
index 77f5ad58..77f5ad58 100644
--- a/mitmproxy/docs/schematics/architecture.pdf
+++ b/docs/schematics/architecture.pdf
diff --git a/mitmproxy/docs/schematics/architecture.png b/docs/schematics/architecture.png
index 67d6c718..67d6c718 100644
--- a/mitmproxy/docs/schematics/architecture.png
+++ b/docs/schematics/architecture.png
diff --git a/mitmproxy/docs/schematics/architecture.vsdx b/docs/schematics/architecture.vsdx
index c4ff13d2..c4ff13d2 100644
--- a/mitmproxy/docs/schematics/architecture.vsdx
+++ b/docs/schematics/architecture.vsdx
diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png b/docs/schematics/how-mitmproxy-works-explicit-https.png
index 1f1ca023..1f1ca023 100644
--- a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png
+++ b/docs/schematics/how-mitmproxy-works-explicit-https.png
diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png b/docs/schematics/how-mitmproxy-works-explicit.png
index c9ba26a7..c9ba26a7 100644
--- a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png
+++ b/docs/schematics/how-mitmproxy-works-explicit.png
diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png b/docs/schematics/how-mitmproxy-works-transparent-https.png
index 559cddd2..559cddd2 100644
--- a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png
+++ b/docs/schematics/how-mitmproxy-works-transparent-https.png
diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png b/docs/schematics/how-mitmproxy-works-transparent.png
index 3994d681..3994d681 100644
--- a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png
+++ b/docs/schematics/how-mitmproxy-works-transparent.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-flowchart.png b/docs/schematics/proxy-modes-flowchart.png
index e9568dac..e9568dac 100644
--- a/mitmproxy/docs/schematics/proxy-modes-flowchart.png
+++ b/docs/schematics/proxy-modes-flowchart.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-regular.png b/docs/schematics/proxy-modes-regular.png
index 95bada08..95bada08 100644
--- a/mitmproxy/docs/schematics/proxy-modes-regular.png
+++ b/docs/schematics/proxy-modes-regular.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-reverse.png b/docs/schematics/proxy-modes-reverse.png
index 071d3fc8..071d3fc8 100644
--- a/mitmproxy/docs/schematics/proxy-modes-reverse.png
+++ b/docs/schematics/proxy-modes-reverse.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-1.png b/docs/schematics/proxy-modes-transparent-1.png
index 002e0e76..002e0e76 100644
--- a/mitmproxy/docs/schematics/proxy-modes-transparent-1.png
+++ b/docs/schematics/proxy-modes-transparent-1.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-2.png b/docs/schematics/proxy-modes-transparent-2.png
index 41997b05..41997b05 100644
--- a/mitmproxy/docs/schematics/proxy-modes-transparent-2.png
+++ b/docs/schematics/proxy-modes-transparent-2.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-3.png b/docs/schematics/proxy-modes-transparent-3.png
index ee26cb4f..ee26cb4f 100644
--- a/mitmproxy/docs/schematics/proxy-modes-transparent-3.png
+++ b/docs/schematics/proxy-modes-transparent-3.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png b/docs/schematics/proxy-modes-transparent-wrong.png
index ca501e93..ca501e93 100644
--- a/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png
+++ b/docs/schematics/proxy-modes-transparent-wrong.png
diff --git a/mitmproxy/docs/schematics/proxy-modes-upstream.png b/docs/schematics/proxy-modes-upstream.png
index d40a6494..d40a6494 100644
--- a/mitmproxy/docs/schematics/proxy-modes-upstream.png
+++ b/docs/schematics/proxy-modes-upstream.png
diff --git a/mitmproxy/docs/schematics/proxy-modes.pdf b/docs/schematics/proxy-modes.pdf
index f07ea05e..f07ea05e 100644
--- a/mitmproxy/docs/schematics/proxy-modes.pdf
+++ b/docs/schematics/proxy-modes.pdf
diff --git a/mitmproxy/docs/schematics/proxy-modes.vsdx b/docs/schematics/proxy-modes.vsdx
index 0128a142..0128a142 100644
--- a/mitmproxy/docs/schematics/proxy-modes.vsdx
+++ b/docs/schematics/proxy-modes.vsdx
diff --git a/mitmproxy/docs/screenshots/firefox3-import.jpg b/docs/screenshots/firefox3-import.jpg
index 47fcd672..47fcd672 100644
--- a/mitmproxy/docs/screenshots/firefox3-import.jpg
+++ b/docs/screenshots/firefox3-import.jpg
diff --git a/mitmproxy/docs/screenshots/firefox3-trust.jpg b/docs/screenshots/firefox3-trust.jpg
index 50a2f341..50a2f341 100644
--- a/mitmproxy/docs/screenshots/firefox3-trust.jpg
+++ b/docs/screenshots/firefox3-trust.jpg
diff --git a/mitmproxy/docs/screenshots/firefox3.jpg b/docs/screenshots/firefox3.jpg
index 6c4613b6..6c4613b6 100644
--- a/mitmproxy/docs/screenshots/firefox3.jpg
+++ b/docs/screenshots/firefox3.jpg
diff --git a/mitmproxy/docs/screenshots/ios-gateway.png b/docs/screenshots/ios-gateway.png
index 2489cba3..2489cba3 100644
--- a/mitmproxy/docs/screenshots/ios-gateway.png
+++ b/docs/screenshots/ios-gateway.png
diff --git a/mitmproxy/docs/screenshots/ios-installed.png b/docs/screenshots/ios-installed.png
index 2071e441..2071e441 100644
--- a/mitmproxy/docs/screenshots/ios-installed.png
+++ b/docs/screenshots/ios-installed.png
diff --git a/mitmproxy/docs/screenshots/ios-manual.png b/docs/screenshots/ios-manual.png
index 3977acfe..3977acfe 100644
--- a/mitmproxy/docs/screenshots/ios-manual.png
+++ b/docs/screenshots/ios-manual.png
diff --git a/mitmproxy/docs/screenshots/ios-profile.png b/docs/screenshots/ios-profile.png
index 5bcd5a0d..5bcd5a0d 100644
--- a/mitmproxy/docs/screenshots/ios-profile.png
+++ b/docs/screenshots/ios-profile.png
diff --git a/mitmproxy/docs/screenshots/ios-reverse.png b/docs/screenshots/ios-reverse.png
index 6ab5b7c0..6ab5b7c0 100644
--- a/mitmproxy/docs/screenshots/ios-reverse.png
+++ b/docs/screenshots/ios-reverse.png
diff --git a/mitmproxy/docs/screenshots/ios-warning.png b/docs/screenshots/ios-warning.png
index d882c514..d882c514 100644
--- a/mitmproxy/docs/screenshots/ios-warning.png
+++ b/docs/screenshots/ios-warning.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-flowview.png b/docs/screenshots/mitmproxy-flowview.png
index 154963fe..154963fe 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-flowview.png
+++ b/docs/screenshots/mitmproxy-flowview.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png b/docs/screenshots/mitmproxy-intercept-filt.png
index 60556ee7..60556ee7 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png
+++ b/docs/screenshots/mitmproxy-intercept-filt.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png b/docs/screenshots/mitmproxy-intercept-mid.png
index d5b03922..d5b03922 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png
+++ b/docs/screenshots/mitmproxy-intercept-mid.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png b/docs/screenshots/mitmproxy-intercept-options.png
index 8dc4ad2c..8dc4ad2c 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png
+++ b/docs/screenshots/mitmproxy-intercept-options.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png b/docs/screenshots/mitmproxy-intercept-result.png
index 7d9f5c94..7d9f5c94 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png
+++ b/docs/screenshots/mitmproxy-intercept-result.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png b/docs/screenshots/mitmproxy-kveditor-editmode.png
index a8315ee5..a8315ee5 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png
+++ b/docs/screenshots/mitmproxy-kveditor-editmode.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy-kveditor.png b/docs/screenshots/mitmproxy-kveditor.png
index 144b9701..144b9701 100644
--- a/mitmproxy/docs/screenshots/mitmproxy-kveditor.png
+++ b/docs/screenshots/mitmproxy-kveditor.png
diff --git a/mitmproxy/docs/screenshots/mitmproxy.png b/docs/screenshots/mitmproxy.png
index 42a10e32..42a10e32 100644
--- a/mitmproxy/docs/screenshots/mitmproxy.png
+++ b/docs/screenshots/mitmproxy.png
diff --git a/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png b/docs/screenshots/osx-addcert-alwaystrust.png
index 4c5cc704..4c5cc704 100644
--- a/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png
+++ b/docs/screenshots/osx-addcert-alwaystrust.png
diff --git a/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png b/docs/screenshots/win7-certstore-trustedroot.png
index e15a87f5..e15a87f5 100644
--- a/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png
+++ b/docs/screenshots/win7-certstore-trustedroot.png
diff --git a/mitmproxy/docs/screenshots/win7-certstore.png b/docs/screenshots/win7-certstore.png
index f8ce54bd..f8ce54bd 100644
--- a/mitmproxy/docs/screenshots/win7-certstore.png
+++ b/docs/screenshots/win7-certstore.png
diff --git a/mitmproxy/docs/screenshots/win7-wizard.png b/docs/screenshots/win7-wizard.png
index eff6ad09..eff6ad09 100644
--- a/mitmproxy/docs/screenshots/win7-wizard.png
+++ b/docs/screenshots/win7-wizard.png
diff --git a/mitmproxy/docs/screenshots/winpythoninstaller.jpg b/docs/screenshots/winpythoninstaller.jpg
index 0473c66a..0473c66a 100644
--- a/mitmproxy/docs/screenshots/winpythoninstaller.jpg
+++ b/docs/screenshots/winpythoninstaller.jpg
diff --git a/mitmproxy/docs/scripting/inlinescripts.rst b/docs/scripting/inlinescripts.rst
index 89bff2c1..89bff2c1 100644
--- a/mitmproxy/docs/scripting/inlinescripts.rst
+++ b/docs/scripting/inlinescripts.rst
diff --git a/mitmproxy/docs/scripting/mitmproxy.rst b/docs/scripting/mitmproxy.rst
index 1626eb5a..1626eb5a 100644
--- a/mitmproxy/docs/scripting/mitmproxy.rst
+++ b/docs/scripting/mitmproxy.rst
diff --git a/mitmproxy/docs/transparent.rst b/docs/transparent.rst
index eb77c76c..eb77c76c 100644
--- a/mitmproxy/docs/transparent.rst
+++ b/docs/transparent.rst
diff --git a/mitmproxy/docs/transparent/linux.rst b/docs/transparent/linux.rst
index ce79128c..ce79128c 100644
--- a/mitmproxy/docs/transparent/linux.rst
+++ b/docs/transparent/linux.rst
diff --git a/mitmproxy/docs/transparent/osx.rst b/docs/transparent/osx.rst
index 1791105f..1791105f 100644
--- a/mitmproxy/docs/transparent/osx.rst
+++ b/docs/transparent/osx.rst
diff --git a/mitmproxy/docs/tutorials/30second.rst b/docs/tutorials/30second.rst
index 4c8bf326..4c8bf326 100644
--- a/mitmproxy/docs/tutorials/30second.rst
+++ b/docs/tutorials/30second.rst
diff --git a/mitmproxy/docs/tutorials/gamecenter.rst b/docs/tutorials/gamecenter.rst
index 9dce5df8..9dce5df8 100644
--- a/mitmproxy/docs/tutorials/gamecenter.rst
+++ b/docs/tutorials/gamecenter.rst
diff --git a/mitmproxy/docs/tutorials/leaderboard.png b/docs/tutorials/leaderboard.png
index c1be8df5..c1be8df5 100644
--- a/mitmproxy/docs/tutorials/leaderboard.png
+++ b/docs/tutorials/leaderboard.png
diff --git a/mitmproxy/docs/tutorials/one.png b/docs/tutorials/one.png
index 78a636cf..78a636cf 100644
--- a/mitmproxy/docs/tutorials/one.png
+++ b/docs/tutorials/one.png
diff --git a/mitmproxy/docs/tutorials/supermega.png b/docs/tutorials/supermega.png
index d416f71f..d416f71f 100644
--- a/mitmproxy/docs/tutorials/supermega.png
+++ b/docs/tutorials/supermega.png
diff --git a/mitmproxy/docs/tutorials/transparent-dhcp.rst b/docs/tutorials/transparent-dhcp.rst
index ce285b63..ce285b63 100644
--- a/mitmproxy/docs/tutorials/transparent-dhcp.rst
+++ b/docs/tutorials/transparent-dhcp.rst
diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png b/docs/tutorials/transparent-dhcp/step1_proxy.png
index a0c94484..a0c94484 100644
--- a/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png
+++ b/docs/tutorials/transparent-dhcp/step1_proxy.png
diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png b/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
index 4b7b4e9b..4b7b4e9b 100644
--- a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
+++ b/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png
diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png b/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
index b994d4cb..b994d4cb 100644
--- a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
+++ b/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png
diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png b/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
index 2046cc57..2046cc57 100644
--- a/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
+++ b/docs/tutorials/transparent-dhcp/step2_proxied_vm.png
diff --git a/mitmproxy/examples/README b/examples/README
index cf5c4d7d..cf5c4d7d 100644
--- a/mitmproxy/examples/README
+++ b/examples/README
diff --git a/mitmproxy/examples/add_header.py b/examples/add_header.py
index cf1b53cc..cf1b53cc 100644
--- a/mitmproxy/examples/add_header.py
+++ b/examples/add_header.py
diff --git a/mitmproxy/examples/change_upstream_proxy.py b/examples/change_upstream_proxy.py
index 9c454897..9c454897 100644
--- a/mitmproxy/examples/change_upstream_proxy.py
+++ b/examples/change_upstream_proxy.py
diff --git a/mitmproxy/examples/custom_contentviews.py b/examples/custom_contentviews.py
index 776ba99d..776ba99d 100644
--- a/mitmproxy/examples/custom_contentviews.py
+++ b/examples/custom_contentviews.py
diff --git a/mitmproxy/examples/dns_spoofing.py b/examples/dns_spoofing.py
index 7eb79695..7eb79695 100644
--- a/mitmproxy/examples/dns_spoofing.py
+++ b/examples/dns_spoofing.py
diff --git a/mitmproxy/examples/dup_and_replay.py b/examples/dup_and_replay.py
index 9ba91d3b..9ba91d3b 100644
--- a/mitmproxy/examples/dup_and_replay.py
+++ b/examples/dup_and_replay.py
diff --git a/mitmproxy/examples/filt.py b/examples/filt.py
index f99b675c..f99b675c 100644
--- a/mitmproxy/examples/filt.py
+++ b/examples/filt.py
diff --git a/mitmproxy/examples/flowbasic b/examples/flowbasic
index 4a87b86a..4a87b86a 100644
--- a/mitmproxy/examples/flowbasic
+++ b/examples/flowbasic
diff --git a/mitmproxy/examples/flowwriter.py b/examples/flowwriter.py
index 8fb8cc60..8fb8cc60 100644
--- a/mitmproxy/examples/flowwriter.py
+++ b/examples/flowwriter.py
diff --git a/mitmproxy/examples/har_extractor.py b/examples/har_extractor.py
index 4e905438..4e905438 100644
--- a/mitmproxy/examples/har_extractor.py
+++ b/examples/har_extractor.py
diff --git a/mitmproxy/examples/iframe_injector.py b/examples/iframe_injector.py
index fc38b136..fc38b136 100644
--- a/mitmproxy/examples/iframe_injector.py
+++ b/examples/iframe_injector.py
diff --git a/mitmproxy/examples/mitmproxywrapper.py b/examples/mitmproxywrapper.py
index 7ea10715..7ea10715 100644
--- a/mitmproxy/examples/mitmproxywrapper.py
+++ b/examples/mitmproxywrapper.py
diff --git a/mitmproxy/examples/modify_form.py b/examples/modify_form.py
index 3e9d15c0..3e9d15c0 100644
--- a/mitmproxy/examples/modify_form.py
+++ b/examples/modify_form.py
diff --git a/mitmproxy/examples/modify_querystring.py b/examples/modify_querystring.py
index 7f31a48f..7f31a48f 100644
--- a/mitmproxy/examples/modify_querystring.py
+++ b/examples/modify_querystring.py
diff --git a/mitmproxy/examples/modify_response_body.py b/examples/modify_response_body.py
index 88f69e15..88f69e15 100644
--- a/mitmproxy/examples/modify_response_body.py
+++ b/examples/modify_response_body.py
diff --git a/mitmproxy/examples/nonblocking.py b/examples/nonblocking.py
index 41674b2a..41674b2a 100644
--- a/mitmproxy/examples/nonblocking.py
+++ b/examples/nonblocking.py
diff --git a/mitmproxy/examples/proxapp.py b/examples/proxapp.py
index 4d8e7b58..4d8e7b58 100644
--- a/mitmproxy/examples/proxapp.py
+++ b/examples/proxapp.py
diff --git a/mitmproxy/examples/read_dumpfile b/examples/read_dumpfile
index 56746bb8..56746bb8 100644
--- a/mitmproxy/examples/read_dumpfile
+++ b/examples/read_dumpfile
diff --git a/mitmproxy/examples/redirect_requests.py b/examples/redirect_requests.py
index c0a0ccba..c0a0ccba 100644
--- a/mitmproxy/examples/redirect_requests.py
+++ b/examples/redirect_requests.py
diff --git a/mitmproxy/examples/sslstrip.py b/examples/sslstrip.py
index 369427a2..369427a2 100644
--- a/mitmproxy/examples/sslstrip.py
+++ b/examples/sslstrip.py
diff --git a/mitmproxy/examples/stickycookies b/examples/stickycookies
index 8f11de8d..8f11de8d 100644
--- a/mitmproxy/examples/stickycookies
+++ b/examples/stickycookies
diff --git a/mitmproxy/examples/stream.py b/examples/stream.py
index 3adbe437..3adbe437 100644
--- a/mitmproxy/examples/stream.py
+++ b/examples/stream.py
diff --git a/mitmproxy/examples/stream_modify.py b/examples/stream_modify.py
index aa395c03..aa395c03 100644
--- a/mitmproxy/examples/stream_modify.py
+++ b/examples/stream_modify.py
diff --git a/mitmproxy/examples/stub.py b/examples/stub.py
index 516b71a5..516b71a5 100644
--- a/mitmproxy/examples/stub.py
+++ b/examples/stub.py
diff --git a/mitmproxy/examples/tcp_message.py b/examples/tcp_message.py
index c63368e4..c63368e4 100644
--- a/mitmproxy/examples/tcp_message.py
+++ b/examples/tcp_message.py
diff --git a/mitmproxy/examples/tls_passthrough.py b/examples/tls_passthrough.py
index 8c8fa4eb..8c8fa4eb 100644
--- a/mitmproxy/examples/tls_passthrough.py
+++ b/examples/tls_passthrough.py
diff --git a/mitmproxy/examples/upsidedownternet.py b/examples/upsidedownternet.py
index b7489cb6..b7489cb6 100644
--- a/mitmproxy/examples/upsidedownternet.py
+++ b/examples/upsidedownternet.py
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index 6920c8e9..54e6e753 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -5,7 +5,7 @@ from . import tservers
 
 
 def test_load_scripts():
-    example_dir = utils.Data("mitmproxy").path("../examples")
+    example_dir = utils.Data("mitmproxy").path("../../examples")
     scripts = glob.glob("%s/*.py" % example_dir)
 
     tmaster = tservers.TestMaster(config.ProxyConfig())