summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/changes.rst7
-rw-r--r--doc/conf.py2
-rw-r--r--doc/install.rst29
-rw-r--r--doc/python-coverage.1.txt2
4 files changed, 24 insertions, 16 deletions
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