fix ReST errors, increment doc-version and push to pytest.org

doc/en/conf.py

@@ -11,6 +11,14 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The full version, including alpha/beta/rc tags.
+# The short X.Y version.
+version = release = "2.2.4.2"
+
 import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -44,13 +52,6 @@ master_doc = 'contents'
 project = u'pytest'
 copyright = u'2011, holger krekel et alii'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The full version, including alpha/beta/rc tags.
-# The short X.Y version.
-version = release = "2.2.4.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/en/example/markers.txt

@@ -262,11 +262,11 @@ Reading markers which were set from multiple places
 
 .. versionadded: 2.2.2
 
+.. regendoc:wipe
+
 If you are heavily using markers in your test suite you may encounter the case where a marker is applied several times to a test function.  From plugin
 code you can read over all such settings.  Example::
 
-.. regendoc:wipe
-
     # content of test_mark_three_times.py
     import pytest
     pytestmark = pytest.mark.glob("module", x=1)
@@ -303,14 +303,14 @@ Let's run this without capturing output and see what we get::
 marking platform specific tests with pytest
 --------------------------------------------------------------
 
+.. regendoc:wipe
+
 Consider you have a test suite which marks tests for particular platforms,
 namely ``pytest.mark.osx``, ``pytest.mark.win32`` etc. and you
 also have tests that run on all platforms and have no specific
 marker.  If you now want to have a way to only run the tests 
 for your particular platform, you could use the following plugin::
 
-.. regendoc:wipe
-
     # content of conftest.py
     #
     import sys

doc/en/example/pythoncollection.txt

@@ -93,7 +93,7 @@ You can always peek at the collection tree without running tests like this::
     
     =============================  in 0.00 seconds =============================
 
-customizing test collection to find all *.py files
+customizing test collection to find all .py files
 ---------------------------------------------------------
 
 .. regendoc:wipe