summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst4
-rw-r--r--README.rst4
-rw-r--r--doc/conf.py4
-rw-r--r--doc/index.rst2
-rw-r--r--doc/python-coverage.1.txt6
5 files changed, 14 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 0f5f02e5..3320bfe2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,8 @@
Change history for Coverage.py
==============================
-Unreleased
-----------
+Version 4.2b1 --- 2016-07-04
+----------------------------
Work from the PyCon 2016 Sprints!
diff --git a/README.rst b/README.rst
index 8cb52b40..25f3d3f0 100644
--- a/README.rst
+++ b/README.rst
@@ -22,7 +22,9 @@ Documentation is on `Read the Docs <http://coverage.readthedocs.io>`_.
Code repository and issue tracker are on `Bitbucket <http://bitbucket.org/ned/coveragepy>`_,
with a mirrored repository on `GitHub <https://github.com/nedbat/coveragepy>`_.
-**New in 4.1:** much-improved branch coverage.
+**New in 4.2:** better support for multiprocessing and combining data.
+
+New in 4.1: much-improved branch coverage.
New in 4.0: ``--concurrency``, plugins for non-Python files, setup.cfg
support, --skip-covered, HTML filtering, and more than 50 issues closed.
diff --git a/doc/conf.py b/doc/conf.py
index 1aae8c8e..53803417 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -56,9 +56,9 @@ copyright = u'2009\N{EN DASH}2016, Ned Batchelder'
# built documents.
#
# The short X.Y version.
-version = '4.1'
+version = '4.2'
# The full version, including alpha/beta/rc tags.
-release = '4.1'
+release = '4.2b1'
# 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 87237483..db2e3622 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -70,7 +70,7 @@ not.
.. ifconfig:: prerelease
- The latest version is coverage.py 4.1b3, released May 10th 2016. It is
+ The latest version is coverage.py 4.2b1, released July 4th 2016. It is
supported on:
* Python versions 2.6, 2.7, 3.3, 3.4, and 3.5.
diff --git a/doc/python-coverage.1.txt b/doc/python-coverage.1.txt
index 135ccbb2..b1d45acd 100644
--- a/doc/python-coverage.1.txt
+++ b/doc/python-coverage.1.txt
@@ -106,6 +106,12 @@ COMMAND REFERENCE
If `PATH` is specified, they are files or directories containing data to
be combined.
+ Options:
+
+ \--append
+ Append coverage data to .coverage, otherwise it starts clean each
+ time.
+
**erase**
Erase previously collected coverage data.