[mq]: doc

doc/announce/release-2.0.0.txt

@@ -1,25 +1,25 @@
-py.test 2.0.0: improved asserts, unittest, reporting, config, docs
+py.test 2.0.0: asserts++, unittest++, reporting++, config++, docs++
 ===========================================================================
 
 Welcome to pytest-2.0.0, a major new release of "py.test", the rapid
 easy Python testing tool.  There are many new features and enhancements,
-see below.  Also a lot of long-deprecated code has been removed,
+see below for summary and detailed lists.  A lot of long-deprecated code
-resulting in a much smaller and cleaner implementation.   Note that
+has been removed, resulting in a much smaller and cleaner
-pytest used to part of the "py" distribution up until version py-1.3.4
+implementation.  See the new docs with examples here:
-but this has changed now:  pytest-2.0.0 only contains py.test related
+
-code and is expected to be backward-compatible to existing test code. If
+    http://pytest.org/2.0.0/index.html
-you want to install it, type one of::
+
+A note on packaging: pytest used to part of the "py" distribution up
+until version py-1.3.4 but this has changed now:  pytest-2.0.0 only
+contains py.test related code and is expected to be backward-compatible
+to existing test code. If you want to install pytest, just type one of::
 
     pip install -U pytest
     easy_install -U pytest
 
-and check out the much improved documentation and examples:
+Many thanks to all issue reporters and people asking questions or
-
-    http://pytest.org/2.0.0/index.html
-
-Thanks to all issue reporters and people asking questions or
 complaining.  Particular thanks to Floris Bruynooghe and Ronny Pfannschmidt
-for their great coding contributions and may others for feedback and help.
+for their great coding contributions and many others for feedback and help.
 
 best,
 holger krekel
@@ -53,16 +53,16 @@ New Features
   see http://pytest.org/2.0.0/customize.html
 
 - improved standard unittest support.  In general py.test should now
-  better run custom TestCases like twisted trial or Django based
+  better be able to run custom unittest.TestCases like twisted trial
-  TestCases.  Also you can now run the tests of an installed
+  or Django based TestCases.  Also you can now run the tests of an
-  'unittest' package with py.test::
+  installed 'unittest' package with py.test::
 
     py.test --pyargs unittest
 
 - new "-q" option which decreases verbosity and prints a more
   nose/unittest-style "dot" output.
 
-- many more improvements in details
+- many many more detailed improvements details
 
 Fixes
 -----------------------
@@ -79,7 +79,7 @@ Fixes
 - fix bug: unittest collected functions now also can have "pytestmark"
   applied at class/module level
 
-Notes
+Important Notes
 --------------------
 
 * The usual way in pre-2.0 times to use py.test in python code was

doc/features.txt

@@ -1,16 +1,39 @@
 py.test Features
 ==================
 
-no-boilerplate testing with Python
+mature no-boilerplate testing with Python
-----------------------------------
+------------------------------------------------
 
-- automatic, fully customizable Python test discovery
+- automatic, customizable :ref:`Python test discovery`
-- write simple test functions and freely group tests
+- simple test functions and freely groupable tests
-- ``assert`` statement for your assertions
+- simple ``assert`` statements for assertions
 - powerful parametrization of test functions
-- rely on helpful traceback and failing assertion reporting
+- very helpful traceback and failing assertion reporting
 - use ``print`` or ``pdb`` debugging on failures
 - enables fully :pep:`8` compliant coding style
+- powerful :ref:`usage` possibilities, well sorted command line options
+- used in many projects, ranging from 10 to 10K tests
+- tested on Unix and Windows from Python 2.4 up to Python 3.1 and 3.2
+- keyword/testname based selection of tests
+
+supports common testing practises and methods
+-----------------------------------------------------------
+
+- can integrate ``nose``, ``unittest.py`` and ``doctest.py`` style
+  tests, including running testcases made for Django and trial
+- supports extended `xUnit style setup`_
+- supports domain-specific :ref:`non-python tests`
+- supports generating testing coverage reports
+- `Javasript unit- and functional testing`_
+
+.. _`Javasript unit- and functional testing`: http://pypi.python.org/pypi/oejskit
+
+distributing tests to local/remote subprocesses
+--------------------------------------------------------
+
+- can distribute tests to multiple CPUs
+- can distribute tests to remote ssh or socket connected machines
+- can run tests in subprocess, re-run failing ones on file-change
 
 extensive plugin and customization system
 ------------------------------------------------------
@@ -22,14 +45,6 @@ extensive plugin and customization system
 - it is `easy`_ to add command line options or
   do other kind of add-ons and customizations.
 
-mature command line testing tool
---------------------------------------
-
-- powerful :ref:`usage` possibilities, well sorted command line options
-- used in many projects, ranging from 10 to 10K tests
-- tested on Unix and Windows from Python 2.4 up to Python 3.1 and 3.2
-- keyword/testname based selection of tests
-
 integrates well with CI systems
 ----------------------------------------
 
@@ -39,24 +54,6 @@ integrates well with CI systems
 
 .. _`tox`: http://codespeak.net/tox
 
-supports common testing practises and methods
------------------------------------------------------------
-
-- supports extended `xUnit style setup`_
-- can integrate ``nose``, ``unittest.py`` and ``doctest.py`` style tests
-- supports generating testing coverage reports
-- supports :ref:`non-python tests`
-- `Javasript unit- and functional testing`_
-
-.. _`Javasript unit- and functional testing`: http://pypi.python.org/pypi/oejskit
-
-distributing tests to local/remote subprocesses
---------------------------------------------------------
-
-- distribute tests to multiple CPUs
-- distribute tests to remote ssh or socket connected machines
-- run tests in subprocess, re-run failing ones on file-change
-
 skip or expect-to-fail a test
 -------------------------------------------
 

doc/goodpractises.txt

@@ -22,6 +22,7 @@ server Hudson_.
 .. _pip: http://pypi.python.org/pypi/pip
 
 .. _`test discovery`:
+.. _`Python test discovery`:
 
 Conventions for Python test discovery
 -------------------------------------------------