aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-08-06 21:12:20 +1200
committerAldo Cortesi <aldo@nullcube.com>2011-08-06 21:19:22 +1200
commit8309ab0ec83f5fef664e0763361fca987547234b (patch)
treed22c4e3494da4536366b44a14fd2a1b0653e09f6
parent2e72b310d9f10462e9eee96f07f39d9d9c08e0fb (diff)
downloadmitmproxy-8309ab0ec83f5fef664e0763361fca987547234b.tar.gz
mitmproxy-8309ab0ec83f5fef664e0763361fca987547234b.tar.bz2
mitmproxy-8309ab0ec83f5fef664e0763361fca987547234b.zip
Prep for 0.6 release.
- Update contributors file. - Bump version number - Include version number in docs
-rw-r--r--CONTRIBUTORS5
-rw-r--r--doc-src/_layout.html2
-rw-r--r--doc-src/_websitelayout.html2
-rw-r--r--doc-src/index.py1
-rw-r--r--libmproxy/version.py2
5 files changed, 7 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7cd0b19c..c3f658cc 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 287bca87..c711e6dd 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 a56c107b..0404619b 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 0191de3d..451cf8d6 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 d0a1851e..5a87f339 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])