summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES21
-rw-r--r--sphinx/__init__.py6
2 files changed, 24 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 5ab2a694d..cfaf281fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+Release 6.0.0 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
Release 5.1.0 (in development)
==============================
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 3fd1fe0f0..7d094c7f4 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -21,8 +21,8 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated",
warnings.filterwarnings('ignore', 'The frontend.Option class .*',
DeprecationWarning, module='docutils.frontend')
-__version__ = '5.1.0+'
-__released__ = '5.1.0' # used when Sphinx builds its own docs
+__version__ = '6.0.0'
+__released__ = '6.0.0' # used when Sphinx builds its own docs
#: Version info for better programmatic use.
#:
@@ -32,7 +32,7 @@ __released__ = '5.1.0' # used when Sphinx builds its own docs
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (5, 1, 0, 'beta', 0)
+version_info = (6, 0, 0, 'final', 0)
package_dir = path.abspath(path.dirname(__file__))