From 8b666819296e1109a3a9d92175ef507b46700e85 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 1 Jan 2013 14:09:43 +1300
Subject: Much-needed facelift for the docs.

---
 doc-src/_layout.html | 101 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 73 insertions(+), 28 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index d7637194..1ea11bf2 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -1,30 +1,75 @@
-<div id="doc">
-    <div style="" id="hd" class="doc">
-        <!--(block nav)-->
-        <div id="nav">
-            <!--(block pb)-->
-            <a href="@!urlTo(previous)!@">prev</a>
-            <!--(end)-->
-            <!--(block nb)-->
-            <a href="@!urlTo(next)!@">next</a>
-            <!--(end)-->
-            $!pb if previous else "prev"!$ |
-            <a href="@!urlTo('/index.html')!@">index</a> |
-            $!nb if next else "next"!$
-        </div>
-        <!--(end)-->
-        $!nav if this.title!="docs" else ""!$
-        <h1><a href="@!urlTo("/index.html")!@">mitmproxy 0.9 docs</a></h1>
-    </div>
-    <div id="bd">
-        <div id="yui-main">
-            <div style="" class="yui-b">
-                $!title if this.title!="docs" else ""!$
-                $!body!$
-            </div>
-        </div>
-    </div>
-    <div style="" id="ft" class="doc">
-        <p>@!copyright!@</p>
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </a>
+      <a class="brand" href="@!urlTo("/index.html")!@">mitmproxy 0.9 docs</a>
+      </div><!--/.nav-collapse -->
     </div>
+  </div>
 </div>
+
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span3">
+      <div class="well sidebar-nav">
+
+
+<ul class="nav nav-list">
+    <li><a href="@!urlTo("intro.html")!@">Introduction</a></li>
+    <li><a href="@!urlTo("install.html")!@">Installation</a></li>
+    <li><a href="@!urlTo("mitmproxy.html")!@">mitmproxy</a></li>
+    <li><a href="@!urlTo("mitmdump.html")!@">mitmdump</a></li>
+    <li><a href="@!urlTo("faq.html")!@">FAQ</a></li>
+
+    <li class="nav-header">Features</li>
+            <li><a href="@!urlTo("clientreplay.html")!@">Client-side replay</a></li>
+            <li><a href="@!urlTo("serverreplay.html")!@">Server-side replay</a></li>
+            <li><a href="@!urlTo("sticky.html")!@">Sticky cookies and auth</a></li>
+            <li><a href="@!urlTo("reverseproxy.html")!@">Reverse proxy mode</a></li>
+            <li><a href="@!urlTo("upstreamcerts.html")!@">Upstream Certs</a></li>
+            <li><a href="@!urlTo("replacements.html")!@">Replacements</a></li>
+            <li><a href="@!urlTo("anticache.html")!@">Anticache</a></li>
+            <li><a href="@!urlTo("filters.html")!@">Filter expressions</a></li>
+
+    <li class="nav-header">Scripting mitmproxy</li>
+            <li><a href="@!urlTo("scripting/inlinescripts.html")!@">Inline Scripts</a></li>
+            <li><a href="@!urlTo("scripting/libmproxy.html")!@">libmproxy</a></li>
+
+    <li class="nav-header">SSL interception</li>
+            <li><a href="@!urlTo("ssl.html")!@">Overview</a></li>
+            <li><a href="@!urlTo("certinstall/firefox.html")!@">Firefox</a></li>
+            <li><a href="@!urlTo("certinstall/osx.html")!@">OSX</a></li>
+            <li><a href="@!urlTo("certinstall/windows7.html")!@">Windows 7</a></li>
+            <li><a href="@!urlTo("certinstall/ios.html")!@">iPhone/iPad</a></li>
+            <li><a href="@!urlTo("certinstall/android.html")!@">Android</a></li>
+
+    <li class="nav-header">Transparent Proxying</li>
+            <li><a href="@!urlTo("transparent.html")!@">Overview</a></li>
+            <li><a href="@!urlTo("transparent/linux.html")!@">Linux</a></li>
+            <li><a href="@!urlTo("transparent/osx.html")!@">OSX</a></li>
+
+     <li class="nav-header">Tutorials</li>
+            <li> <a href="@!urlTo("tutorials/30second.html")!@">Client replay: a 30 second example</a> </li>
+            <li> <a href="@!urlTo("tutorials/gamecenter.html")!@">Setting highscores on Apple's GameCenter</a> </li>
+
+</ul>
+
+
+      </div><!--/.well -->
+    </div><!--/span-->
+    <div class="span9">
+        $!body!$
+    </div><!--/span-->
+  </div><!--/row-->
+
+  <hr>
+
+  <footer>
+    <p>@!copyright!@</p>
+  </footer>
+
+</div><!--/.fluid-container-->
-- 
cgit v1.2.3


From 6f1fa30bc6bc0081917dbabe7da34c2a7ee9ea61 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 1 Jan 2013 15:30:02 +1300
Subject: Docs: make nav sidebar work

---
 doc-src/_layout.html | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index 1ea11bf2..ecc10736 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -19,42 +19,42 @@
 
 
 <ul class="nav nav-list">
-    <li><a href="@!urlTo("intro.html")!@">Introduction</a></li>
-    <li><a href="@!urlTo("install.html")!@">Installation</a></li>
-    <li><a href="@!urlTo("mitmproxy.html")!@">mitmproxy</a></li>
-    <li><a href="@!urlTo("mitmdump.html")!@">mitmdump</a></li>
-    <li><a href="@!urlTo("faq.html")!@">FAQ</a></li>
+    $!nav("intro.html", this, state)!$
+    $!nav("install.html", this, state)!$
+    $!nav("mitmproxy.html", this, state)!$
+    $!nav("mitmdump.html", this, state)!$
+    $!nav("faq.html", this, state)!$
 
     <li class="nav-header">Features</li>
-            <li><a href="@!urlTo("clientreplay.html")!@">Client-side replay</a></li>
-            <li><a href="@!urlTo("serverreplay.html")!@">Server-side replay</a></li>
-            <li><a href="@!urlTo("sticky.html")!@">Sticky cookies and auth</a></li>
-            <li><a href="@!urlTo("reverseproxy.html")!@">Reverse proxy mode</a></li>
-            <li><a href="@!urlTo("upstreamcerts.html")!@">Upstream Certs</a></li>
-            <li><a href="@!urlTo("replacements.html")!@">Replacements</a></li>
-            <li><a href="@!urlTo("anticache.html")!@">Anticache</a></li>
-            <li><a href="@!urlTo("filters.html")!@">Filter expressions</a></li>
-
-    <li class="nav-header">Scripting mitmproxy</li>
-            <li><a href="@!urlTo("scripting/inlinescripts.html")!@">Inline Scripts</a></li>
-            <li><a href="@!urlTo("scripting/libmproxy.html")!@">libmproxy</a></li>
+            $!nav("clientreplay.html", this, state)!$
+            $!nav("serverreplay.html", this, state)!$
+            $!nav("sticky.html", this, state)!$
+            $!nav("reverseproxy.html", this, state)!$
+            $!nav("upstreamcerts.html", this, state)!$
+            $!nav("replacements.html", this, state)!$
+            $!nav("anticache.html", this, state)!$
+            $!nav("filters.html", this, state)!$
 
     <li class="nav-header">SSL interception</li>
-            <li><a href="@!urlTo("ssl.html")!@">Overview</a></li>
-            <li><a href="@!urlTo("certinstall/firefox.html")!@">Firefox</a></li>
-            <li><a href="@!urlTo("certinstall/osx.html")!@">OSX</a></li>
-            <li><a href="@!urlTo("certinstall/windows7.html")!@">Windows 7</a></li>
-            <li><a href="@!urlTo("certinstall/ios.html")!@">iPhone/iPad</a></li>
-            <li><a href="@!urlTo("certinstall/android.html")!@">Android</a></li>
+            $!nav("ssl.html", this, state)!$
+            $!nav("certinstall/firefox.html", this, state)!$
+            $!nav("certinstall/osx.html", this, state)!$
+            $!nav("certinstall/windows7.html", this, state)!$
+            $!nav("certinstall/ios.html", this, state)!$
+            $!nav("certinstall/android.html", this, state)!$
 
     <li class="nav-header">Transparent Proxying</li>
-            <li><a href="@!urlTo("transparent.html")!@">Overview</a></li>
-            <li><a href="@!urlTo("transparent/linux.html")!@">Linux</a></li>
-            <li><a href="@!urlTo("transparent/osx.html")!@">OSX</a></li>
+            $!nav("transparent.html", this, state)!$
+            $!nav("transparent/linux.html", this, state)!$
+            $!nav("transparent/osx.html", this, state)!$
 
      <li class="nav-header">Tutorials</li>
-            <li> <a href="@!urlTo("tutorials/30second.html")!@">Client replay: a 30 second example</a> </li>
-            <li> <a href="@!urlTo("tutorials/gamecenter.html")!@">Setting highscores on Apple's GameCenter</a> </li>
+            $!nav("tutorials/30second.html", this, state)!$
+            $!nav("tutorials/gamecenter.html", this, state)!$
+
+    <li class="nav-header">Scripting mitmproxy</li>
+            $!nav("scripting/inlinescripts.html", this, state)!$
+            $!nav("scripting/libmproxy.html", this, state)!$
 
 </ul>
 
-- 
cgit v1.2.3


From 8b768983a7130c1c1b5fa4dc135592282c2baa48 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 1 Jan 2013 15:55:15 +1300
Subject: Preliminary changelog.

---
 doc-src/_layout.html | 78 +++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index ecc10736..d2d73249 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -16,54 +16,52 @@
   <div class="row-fluid">
     <div class="span3">
       <div class="well sidebar-nav">
+        <ul class="nav nav-list">
+            $!nav("intro.html", this, state)!$
+            $!nav("install.html", this, state)!$
+            $!nav("mitmproxy.html", this, state)!$
+            $!nav("mitmdump.html", this, state)!$
+            $!nav("faq.html", this, state)!$
 
+            <li class="nav-header">Features</li>
+                    $!nav("clientreplay.html", this, state)!$
+                    $!nav("serverreplay.html", this, state)!$
+                    $!nav("sticky.html", this, state)!$
+                    $!nav("reverseproxy.html", this, state)!$
+                    $!nav("upstreamcerts.html", this, state)!$
+                    $!nav("replacements.html", this, state)!$
+                    $!nav("anticache.html", this, state)!$
+                    $!nav("filters.html", this, state)!$
 
-<ul class="nav nav-list">
-    $!nav("intro.html", this, state)!$
-    $!nav("install.html", this, state)!$
-    $!nav("mitmproxy.html", this, state)!$
-    $!nav("mitmdump.html", this, state)!$
-    $!nav("faq.html", this, state)!$
+            <li class="nav-header">SSL interception</li>
+                    $!nav("ssl.html", this, state)!$
+                    $!nav("certinstall/firefox.html", this, state)!$
+                    $!nav("certinstall/osx.html", this, state)!$
+                    $!nav("certinstall/windows7.html", this, state)!$
+                    $!nav("certinstall/ios.html", this, state)!$
+                    $!nav("certinstall/android.html", this, state)!$
 
-    <li class="nav-header">Features</li>
-            $!nav("clientreplay.html", this, state)!$
-            $!nav("serverreplay.html", this, state)!$
-            $!nav("sticky.html", this, state)!$
-            $!nav("reverseproxy.html", this, state)!$
-            $!nav("upstreamcerts.html", this, state)!$
-            $!nav("replacements.html", this, state)!$
-            $!nav("anticache.html", this, state)!$
-            $!nav("filters.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">SSL interception</li>
-            $!nav("ssl.html", this, state)!$
-            $!nav("certinstall/firefox.html", this, state)!$
-            $!nav("certinstall/osx.html", this, state)!$
-            $!nav("certinstall/windows7.html", this, state)!$
-            $!nav("certinstall/ios.html", this, state)!$
-            $!nav("certinstall/android.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">Tutorials</li>
-            $!nav("tutorials/30second.html", this, state)!$
-            $!nav("tutorials/gamecenter.html", this, state)!$
-
-    <li class="nav-header">Scripting mitmproxy</li>
-            $!nav("scripting/inlinescripts.html", this, state)!$
-            $!nav("scripting/libmproxy.html", this, state)!$
-
-</ul>
+             <li class="nav-header">Tutorials</li>
+                    $!nav("tutorials/30second.html", this, state)!$
+                    $!nav("tutorials/gamecenter.html", this, state)!$
 
+            <li class="nav-header">Scripting mitmproxy</li>
+                    $!nav("scripting/inlinescripts.html", this, state)!$
+                    $!nav("scripting/libmproxy.html", this, state)!$
+        </ul>
+      </div>
+    </div>
 
-      </div><!--/.well -->
-    </div><!--/span-->
     <div class="span9">
+        <h1>@!pageTitle!@</h1>
         $!body!$
-    </div><!--/span-->
+    </div>
+
   </div><!--/row-->
 
   <hr>
-- 
cgit v1.2.3


From e93b343ac4917979f912afe5a2f0bbc8be0b28d7 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 1 Jan 2013 16:35:52 +1300
Subject: Docs and Readme

- Don't keep a full duplicate readme just for pypi. Pypi really needs to
learn to read markdown.
- Style and content adjustments
---
 doc-src/_layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index d2d73249..826279ef 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -17,7 +17,7 @@
     <div class="span3">
       <div class="well sidebar-nav">
         <ul class="nav nav-list">
-            $!nav("intro.html", this, state)!$
+            $!nav("index.html", this, state)!$
             $!nav("install.html", this, state)!$
             $!nav("mitmproxy.html", this, state)!$
             $!nav("mitmdump.html", this, state)!$
@@ -58,7 +58,7 @@
     </div>
 
     <div class="span9">
-        <h1>@!pageTitle!@</h1>
+        <h1>@!this.title!@</h1>
         $!body!$
     </div>
 
-- 
cgit v1.2.3


From 7b3d3dc85e9618f4b16f2c81a37429ebdaf5ebf2 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 2 Jan 2013 14:02:41 +1300
Subject: Documentation, setup.py updates, styling.

---
 doc-src/_layout.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index 826279ef..a4e84bcc 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -24,14 +24,16 @@
             $!nav("faq.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("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)!$
-                    $!nav("replacements.html", this, state)!$
-                    $!nav("anticache.html", this, state)!$
-                    $!nav("filters.html", this, state)!$
 
             <li class="nav-header">SSL interception</li>
                     $!nav("ssl.html", this, state)!$
@@ -58,7 +60,9 @@
     </div>
 
     <div class="span9">
+        <div class="page-header">
         <h1>@!this.title!@</h1>
+        </div>
         $!body!$
     </div>
 
-- 
cgit v1.2.3


From f5e49ef598f46257cc783e52ef4223a3461f1d84 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 3 Jan 2013 17:26:59 +1300
Subject: First draft of "How mitmproxy works", a complete guide to the
 mechanics of the proxy process

---
 doc-src/_layout.html | 53 +++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

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

diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index a4e84bcc..d9ff6be1 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -19,42 +19,45 @@
         <ul class="nav nav-list">
             $!nav("index.html", this, state)!$
             $!nav("install.html", this, state)!$
-            $!nav("mitmproxy.html", this, state)!$
-            $!nav("mitmdump.html", this, state)!$
+            $!nav("howmitmproxy.html", this, state)!$
             $!nav("faq.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("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)!$
+                $!nav("anticache.html", this, state)!$
+                $!nav("clientreplay.html", this, state)!$
+                $!nav("filters.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">SSL interception</li>
-                    $!nav("ssl.html", this, state)!$
-                    $!nav("certinstall/firefox.html", this, state)!$
-                    $!nav("certinstall/osx.html", this, state)!$
-                    $!nav("certinstall/windows7.html", this, state)!$
-                    $!nav("certinstall/ios.html", this, state)!$
-                    $!nav("certinstall/android.html", this, state)!$
+                $!nav("ssl.html", this, state)!$
+                $!nav("certinstall/firefox.html", this, state)!$
+                $!nav("certinstall/osx.html", this, state)!$
+                $!nav("certinstall/windows7.html", this, state)!$
+                $!nav("certinstall/ios.html", this, state)!$
+                $!nav("certinstall/android.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)!$
+                $!nav("transparent.html", this, state)!$
+                $!nav("transparent/linux.html", this, state)!$
+                $!nav("transparent/osx.html", this, state)!$
 
              <li class="nav-header">Tutorials</li>
-                    $!nav("tutorials/30second.html", this, state)!$
-                    $!nav("tutorials/gamecenter.html", this, state)!$
+                $!nav("tutorials/30second.html", this, state)!$
+                $!nav("tutorials/gamecenter.html", this, state)!$
 
             <li class="nav-header">Scripting mitmproxy</li>
-                    $!nav("scripting/inlinescripts.html", this, state)!$
-                    $!nav("scripting/libmproxy.html", this, state)!$
+                $!nav("scripting/inlinescripts.html", this, state)!$
+                $!nav("scripting/libmproxy.html", this, state)!$
         </ul>
       </div>
     </div>
-- 
cgit v1.2.3