diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /doc-src/_nav.html | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
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)!$ |