summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Schlichting <hanno@hannosch.eu>2014-06-19 12:53:06 +0200
committerHanno Schlichting <hanno@hannosch.eu>2014-06-19 12:53:06 +0200
commit93a718ea4c20df797766742c3d74de281613c651 (patch)
tree9b991c4c5c6b4f6ce05705e4f540e8b799facbd7
parent49aee2e99b625079a29a0749fb11bf6384040b51 (diff)
downloadkazoo-93a718ea4c20df797766742c3d74de281613c651.tar.gz
prepare release2.0
-rw-r--r--CHANGES.rst2
-rw-r--r--docs/conf.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a521335..b9661b6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
Changelog
=========
-2.0 (unreleased)
+2.0 (2014-06-19)
----------------
Documentation
diff --git a/docs/conf.py b/docs/conf.py
index c5b9769..9b20b7a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,16 +57,16 @@ master_doc = 'index'
# General information about the project.
project = u'kazoo'
-copyright = u'2011-2013, Kazoo team'
+copyright = u'2011-2014, Kazoo team'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '1.4'
+version = '2.0'
# The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '2.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.