From f47d89ff4e710f6d2df755fe526e91a5cf236cfa Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 27 Jan 2014 14:16:23 +1300
Subject: Revert "Move the doc tree out into its own repo."

This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf.
---
 doc-src/_nav.html | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 doc-src/_nav.html

(limited to 'doc-src/_nav.html')

diff --git a/doc-src/_nav.html b/doc-src/_nav.html
new file mode 100644
index 00000000..b256f47f
--- /dev/null
+++ b/doc-src/_nav.html
@@ -0,0 +1,48 @@
+<ul class="nav nav-list">
+    $!nav(idxpath, this, state)!$
+    $!nav("install.html", this, state)!$
+    $!nav("howmitmproxy.html", this, state)!$
+
+    <li class="nav-header">Tools</li>
+        $!nav("mitmproxy.html", this, state)!$
+        $!nav("mitmdump.html", this, state)!$
+
+    <li class="nav-header">Features</li>
+        $!nav("anticache.html", this, state)!$
+        $!nav("clientreplay.html", this, state)!$
+        $!nav("filters.html", this, state)!$
+        $!nav("forwardproxy.html", this, state)!$
+        $!nav("proxyauth.html", this, state)!$
+        $!nav("replacements.html", this, state)!$
+        $!nav("serverreplay.html", this, state)!$
+        $!nav("setheaders.html", this, state)!$
+        $!nav("sticky.html", this, state)!$
+        $!nav("reverseproxy.html", this, state)!$
+        $!nav("upstreamcerts.html", this, state)!$
+
+    <li class="nav-header">Installing Certificates</li>
+        $!nav("ssl.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/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>
+        $!nav("scripting/inlinescripts.html", this, state)!$
+        $!nav("scripting/libmproxy.html", this, state)!$
+
+    <li class="nav-header">Tutorials</li>
+        $!nav("tutorials/30second.html", this, state)!$
+        $!nav("tutorials/gamecenter.html", this, state)!$
+        $!nav("tutorials/transparent-dhcp.html", this, state)!$
+
+    <li class="nav-header">Hacking</li>
+        $!nav("dev/testing.html", this, state)!$
+</ul>
-- 
cgit v1.2.3


From 784f411273c4b09797529822e336ce34fa8d1f23 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 27 Jan 2014 14:45:20 +1300
Subject: Instructions for adding mitmproxy certificates to the Java trust
 store.

Fixes #146
---
 doc-src/_nav.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc-src/_nav.html')

diff --git a/doc-src/_nav.html b/doc-src/_nav.html
index b256f47f..6dfbaba5 100644
--- a/doc-src/_nav.html
+++ b/doc-src/_nav.html
@@ -26,6 +26,7 @@
         $!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)!$
 
-- 
cgit v1.2.3


From f3369529abd601d7f10fcdb45ec280e8f6a7ad19 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 28 Jan 2014 13:24:11 +1300
Subject: Adjust docs for web app certificate installation.

---
 doc-src/_nav.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc-src/_nav.html')

diff --git a/doc-src/_nav.html b/doc-src/_nav.html
index 6dfbaba5..5460601f 100644
--- a/doc-src/_nav.html
+++ b/doc-src/_nav.html
@@ -22,6 +22,7 @@
 
     <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)!$
-- 
cgit v1.2.3