Update version and docs for 4.0a1

8 files changed, 37 insertions, 23 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 1c7881e0..707d6c9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,13 +2,15 @@
 Change history for Coverage.py
 ------------------------------
 
-4.0
----
+
+4.0a1 --- 27 September 2014
+---------------------------
 
 - Python versions supported are now CPython 2.6, 2.7, 3.2, 3.3, and 3.4, and
   PyPy 2.2.
 
-- Gevent, eventlet, and greenlet are now supported, closing `issue 149`_. Huge
+- Gevent, eventlet, and greenlet are now supported, closing `issue 149`_. 
+  The ``concurrency`` setting specifies the concurrency library in use.  Huge
   thanks to Peter Portante for initial implementation, and to Joe Jevnik for
   the final insight that completed the work.
 
@@ -54,8 +56,8 @@ Change history for Coverage.py
 .. _issue 305: https://bitbucket.org/ned/coveragepy/issue/305/pendingdeprecationwarning-the-imp-module
 
 
-3.7.1 -- 13 December 2013
--------------------------
+3.7.1 --- 13 December 2013
+--------------------------
 
 - Improved the speed of HTML report generation by about 20%.
 
diff --git a/coverage/version.py b/coverage/version.py
index 27c2f6b1..fe3f44fa 100644
--- a/coverage/version.py
+++ b/coverage/version.py
@@ -1,7 +1,7 @@
 """The version and URL for coverage.py"""
 # This file is exec'ed in setup.py, don't import anything!
 
-__version__ = "4.0a0"                   # see detailed history in CHANGES.txt
+__version__ = "4.0a1"                   # see detailed history in CHANGES.txt
 
 __url__ = "http://nedbatchelder.com/code/coverage"
 if max(__version__).isalpha():
diff --git a/doc/changes.rst b/doc/changes.rst
index cc95837c..97c3d8c9 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -37,13 +37,14 @@ history, see the `CHANGES.txt`_ file in the source tree.
 
 .. _changes_40:
 
-Version 4.0 --- pre-release
----------------------------
+Version 4.0 pre-release --- 27 September 2014
+---------------------------------------------
 
 - Python versions supported are now CPython 2.6, 2.7, 3.2, 3.3, and 3.4, and
   PyPy 2.2.
 
-- Gevent, eventlet, and greenlet are now supported, closing `issue 149`_. Huge
+- Gevent, eventlet, and greenlet are now supported, closing `issue 149`_. 
+  The ``concurrency`` setting specifies the concurrency library in use.  Huge
   thanks to Peter Portante for initial implementation, and to Joe Jevnik for
   the final insight that completed the work.
 
diff --git a/doc/conf.py b/doc/conf.py
index 0091cb3d..16f566f0 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,7 +40,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'coverage.py'
-copyright = u'2009\N{EN DASH}2013, Ned Batchelder'
+copyright = u'2009\N{EN DASH}2014, Ned Batchelder'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/doc/install.rst b/doc/install.rst
index bc8097a2..7dfa5668 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -20,29 +20,36 @@ Installation
 :history: 20130105T174400, updated for 3.6.
 :history: 20131005T210600, updated for 3.7.
 :history: 20131212T213500, updated for 3.7.1.
+:history: 20140927T102700, updated for 4.0a1.
 
 
 .. highlight:: console
+
 .. _coverage_pypi: http://pypi.python.org/pypi/coverage
 .. _setuptools: http://pypi.python.org/pypi/setuptools
 .. _Distribute: http://packages.python.org/distribute/
 
 
-Installing coverage.py is done in the usual ways. You must have `setuptools`_
-or `Distribute`_ installed already, and then you:
+Installing coverage.py is done in the usual ways. The simplest way is with
+pip::
 
-#.  Download the appropriate kit from the
-    `coverage page on the Python Package Index`__.
+    $ pip install coverage
 
-#.  Run ``python setup.py install``.
+.. ifconfig:: prerelease
 
-or, use::
+    To install a pre-release version, you will need to specify ``--pre``::
 
-    $ pip install coverage
+        $ pip install --pre coverage
 
-or even::
 
-    $ easy_install coverage
+The alternate old-school technique is:
+
+#.  Install (or already have installed) `setuptools`_ or `Distribute`_.
+
+#.  Download the appropriate kit from the
+    `coverage page on the Python Package Index`__.
+
+#.  Run ``python setup.py install``.
 
 .. __: coverage_pypi_
 
@@ -75,9 +82,9 @@ If all went well, you should be able to open a command prompt, and see coverage
 installed properly::
 
     $ coverage --version
-    Coverage.py, version 3.7.1.  http://nedbatchelder.com/code/coverage
+    Coverage.py, version 4.0a1.  http://nedbatchelder.com/code/coverage
 
 You can also invoke coverage as a module::
 
     $ python -m coverage --version
-    Coverage.py, version 3.7.1.  http://nedbatchelder.com/code/coverage
+    Coverage.py, version 4.0a1.  http://nedbatchelder.com/code/coverage
diff --git a/doc/python-coverage.1.txt b/doc/python-coverage.1.txt
index e5f65d63..f79f33d8 100644
--- a/doc/python-coverage.1.txt
+++ b/doc/python-coverage.1.txt
@@ -8,7 +8,7 @@ measure code coverage of Python program execution
 
 :Author: Ned Batchelder <ned@nedbatchelder.com>
 :Author: |author|
-:Date: 2013-10-10
+:Date: 2014-09-27
 :Copyright: BSD license, attribution and disclaimer required.
 :Manual section: 1
 :Manual group: Coverage
diff --git a/howto.txt b/howto.txt
index 3367a063..932a16a3 100644
--- a/howto.txt
+++ b/howto.txt
@@ -7,6 +7,7 @@
     - Pythons 2.6, 2.7, 3.2, 3.3, 3.4
 - Version number in coverage/version.py
     - 3.1a1, 3.1b1, 3.1c1, 3.1
+- Copyright date in coverage/__init__.py
 - Update CHANGES.txt, including release date.
 - Update docstring in setup.py, including "New in x.y:"
 - Update docs
@@ -17,7 +18,7 @@
     - Don't forget the man page: doc/python-coverage.1.txt
     - Generate new sample_html to get the latest, incl footer version number:
         python setup.py develop
-        cd C:\ned\cog\trunk
+        cd ~/cog/trunk
         rm -rf htmlcov
         coverage run --branch --source=cogapp -m cogapp.test_cogapp CogTestsInMemory
         coverage html
diff --git a/setup.py b/setup.py
index 52eb086f..3f7afae6 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,9 @@ Documentation is at `nedbatchelder.com <%s>`_.  Code repository and issue
 tracker are on `Bitbucket <http://bitbucket.org/ned/coveragepy>`_, with a
 mirrored repo on `Github <https://github.com/nedbat/coveragepy>`_.
 
+New in 4.0 alpha: ``--concurrency``, dropped support for older Pythons,
+setup.cfg support.
+
 New in 3.7: ``--debug``, and 12 bugs closed.
 
 New in 3.6: ``--fail-under``, and >20 bugs closed.