diff options
author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
---|---|---|
committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /doc-src/_nav.html | |
parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'doc-src/_nav.html')
-rw-r--r-- | doc-src/_nav.html | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/doc-src/_nav.html b/doc-src/_nav.html index 69175c0c..a07684cb 100644 --- a/doc-src/_nav.html +++ b/doc-src/_nav.html @@ -1,6 +1,7 @@ -<ul class="nav nav-list"> +<ul class="nav nav-sidebar"> $!nav(idxpath, this, state)!$ $!nav("install.html", this, state)!$ + $!nav("certinstall.html", this, state)!$ $!nav("howmitmproxy.html", this, state)!$ $!nav("modes.html", this, state)!$ @@ -28,23 +29,12 @@ $!nav("upstreamcerts.html", this, state)!$ - <li class="nav-header">Installing Certificates</li> - $!nav("ssl.html", this, state)!$ - $!nav("certinstall/webapp.html", this, state)!$ - $!nav("certinstall/android.html", this, state)!$ - $!nav("certinstall/firefox.html", this, state)!$ - $!nav("certinstall/ios.html", this, state)!$ - $!nav("certinstall/ios-simulator.html", this, state)!$ - $!nav("certinstall/java.html", this, state)!$ - $!nav("certinstall/osx.html", this, state)!$ - $!nav("certinstall/windows7.html", this, state)!$ - <li class="nav-header">Transparent Proxying</li> $!nav("transparent.html", this, state)!$ $!nav("transparent/linux.html", this, state)!$ $!nav("transparent/osx.html", this, state)!$ - <li class="nav-header">Scripting mitmproxy</li> + <li class="nav-header">Scripting</li> $!nav("scripting/inlinescripts.html", this, state)!$ $!nav("scripting/libmproxy.html", this, state)!$ |