From 8309ab0ec83f5fef664e0763361fca987547234b Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 6 Aug 2011 21:12:20 +1200
Subject: [PATCH] Prep for 0.6 release.

- Update contributors file.
- Bump version number
- Include version number in docs
---
 CONTRIBUTORS                | 5 ++++-
 doc-src/_layout.html        | 2 +-
 doc-src/_websitelayout.html | 2 +-
 doc-src/index.py            | 1 -
 libmproxy/version.py        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7cd0b19c3..c3f658ccb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,8 @@
-    203 Aldo Cortesi
+    278 Aldo Cortesi
      18 Henrik Nordstrom
      13 Thomas Roth
+     10 Stephen Altamirano
+      2 alts
       1 Yuangxuan Wang
       1 Henrik Nordström
+      1 Felix Wolfsteller
diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index 287bca873..c711e6dd1 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -14,7 +14,7 @@
         </div>
         <!--(end)-->
         $!nav if this.title!="docs" else ""!$
-        <h1><a href="@!urlTo("/index.html")!@">mitmproxy docs</a></h1>
+        <h1><a href="@!urlTo("/index.html")!@">mitmproxy 0.6 docs</a></h1>
     </div>
     <div id="bd">
         <div id="yui-main">
diff --git a/doc-src/_websitelayout.html b/doc-src/_websitelayout.html
index a56c107b7..0404619b1 100644
--- a/doc-src/_websitelayout.html
+++ b/doc-src/_websitelayout.html
@@ -29,7 +29,7 @@
                 </div>
                 <!--(end)-->
                 $!nav if this.title!="docs" else ""!$
-                $!title if this.title!="docs" else "<h1>mitmproxy docs</h1>"!$
+                $!title if this.title!="docs" else "<h1>mitmproxy 0.6 docs</h1>"!$
                 $!body!$
             </div>
         </div>
diff --git a/doc-src/index.py b/doc-src/index.py
index 0191de3d9..451cf8d6e 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -14,7 +14,6 @@ else:
     ns.title = countershape.template.Template(None, "<h1>@!this.title!@</h1>")
     this.layout = countershape.Layout("_layout.html")
 
-ns.docTitle = "mitmproxy"
 this.markup = markup.Markdown()
 ns.docMaintainer = "Aldo Cortesi"
 ns.docMaintainerEmail = "aldo@corte.si"
diff --git a/libmproxy/version.py b/libmproxy/version.py
index d0a1851ea..5a87f3390 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -1,2 +1,2 @@
-IVERSION = (0, 5)
+IVERSION = (0, 6)
 VERSION = ".".join([str(i) for i in IVERSION])