Get ready for 4.0 final

6 files changed, 17 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ce519362..8c96259f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,12 @@ Change history for Coverage.py
 ==============================
 
 
+Version 4.0 --- 20 September 2015
+---------------------------------
+
+No changes from 4.0b3
+
+
 Version 4.0b3 --- 7 September 2015
 ----------------------------------
 
diff --git a/coverage/version.py b/coverage/version.py
index e2e803b2..0eb1bdb3 100644
--- a/coverage/version.py
+++ b/coverage/version.py
@@ -5,7 +5,7 @@
 # This file is exec'ed in setup.py, don't import anything!
 
 # Same semantics as sys.version_info.
-version_info = (4, 0, 0, 'beta', 4)
+version_info = (4, 0, 0, 'final', 0)
 
 
 def _make_version(major, minor, micro, releaselevel, serial):
diff --git a/doc/changes.rst b/doc/changes.rst
index fee58de2..20b2bd73 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -33,6 +33,7 @@ Major change history for coverage.py
 .. :history: 20150124T134800, updated for 4.0a4
 .. :history: 20150802T174700, updated for 4.0b1
 .. :history: 20150822T092800, updated for 4.0b2
+.. :history: 20150919T072700, updated for 4.0
 
 
 These are the major changes for coverage.py.  For a more complete change
@@ -44,15 +45,15 @@ history, see the `CHANGES.txt`_ file in the source tree.
 
 .. _changes_40:
 
-Version 4.0b3 pre-release --- 7 September 2015
---------------------------------------------
+Version 4.0 --- 20 September 2015
+---------------------------------
 
 
 Backward incompatibilities:
 
 - Python versions supported are now:
 
-  - CPython 2.6, 2.7, 3.3, 3.4 and 3.5rc2
+  - CPython 2.6, 2.7, 3.3, 3.4 and 3.5
   - PyPy2 2.4, 2.6
   - PyPy3 2.4
 
diff --git a/doc/conf.py b/doc/conf.py
index 9c373f33..f28a56d9 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -58,7 +58,7 @@ copyright = u'2009\N{EN DASH}2015, Ned Batchelder'
 # The short X.Y version.
 version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0b3'
+release = '4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.rst b/doc/index.rst
index 74dcb8e2..8efd7d64 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -39,6 +39,7 @@ Coverage.py
 .. :history: 20150216T201000, Updated for 4.0a5
 .. :history: 20150802T160200, Updated for 4.0b1
 .. :history: 20150822T092900, Updated for 4.0b2
+.. :history: 20150918T072700, Updated for 4.0
 
 
 Coverage.py is a tool for measuring code coverage of Python programs. It
@@ -51,8 +52,9 @@ not.
 
 .. ifconfig:: not prerelease
 
-    The latest version is coverage.py 3.7.1, released 13 December 2013.
-    It is supported on Python versions 2.6 through 3.4, and PyPy 2.2.
+    The latest version is coverage.py 4.0, released 20 September 2015.
+    It is supported on Python versions 2.6, 2.7, 3.3, 3.4, and 3.5, as well
+    as PyPy 2.4 and 2.6, and PyPy3 2.4.
 
 .. ifconfig:: prerelease
 
diff --git a/howto.txt b/howto.txt
index 3b48a117..e3982461 100644
--- a/howto.txt
+++ b/howto.txt
@@ -7,7 +7,7 @@
     - Pythons 2.6, 2.7, 3.3, 3.4, 3.5
 - Version number in coverage/version.py
     - 3.1a1, 3.1b1, 3.1c1, 3.1
-- Version number in classifiers in setup.py
+- Python version number in classifiers in setup.py
 - Copyright date in NOTICE.txt
 - Update CHANGES.txt, including release date.
 - Update README.rst, including "New in x.y:"