Merge branch '2.3'

[jansson.git] / doc / conf.py

diff --git a/doc/conf.py b/doc/conf.py
index 465d4fe..35c5238 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Jansson'
-copyright = u'2009-2011, Petri Lehtinen'
+copyright = u'2009-2012, Petri Lehtinen'
 
 # 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 = '2.0'
+version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.0pre'
+release = '2.4-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.