diff --git a/_pytest/python.py b/_pytest/python.py
index b28baad2f..9c9cfe9df 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -787,6 +787,27 @@ class FuncargnamesCompatAttr:
         return self.fixturenames
 
 class Metafunc(FuncargnamesCompatAttr):
+    """
+    Metafunc objects are passed to the ``pytest_generate_tests`` hook.
+    They help to inspect a test function and to generate tests according to
+    test configuration or values specified in the class or module where a
+    test function is defined.
+
+    :ivar fixturenames: set of fixture names required by the test function
+
+    :ivar function: underlying python test function
+
+    :ivar cls: class object where the test function is defined in or ``None``.
+
+    :ivar module: the module object where the test function is defined in.
+
+    :ivar config: access to the :class:`_pytest.config.Config` object for the
+        test session.
+
+    :ivar funcargnames:
+        .. deprecated:: 2.3
+            Use ``fixturenames`` instead.
+    """
     def __init__(self, function, fixtureinfo, config, cls=None, module=None):
         self.config = config
         self.module = module
diff --git a/doc/en/announce/index.txt b/doc/en/announce/index.txt
index 884308a7f..b5c0228d7 100644
--- a/doc/en/announce/index.txt
+++ b/doc/en/announce/index.txt
@@ -5,6 +5,7 @@ Release announcements
 .. toctree::
    :maxdepth: 2
 
+   release-2.7.2
    release-2.7.1
    release-2.7.0
    release-2.6.3
diff --git a/doc/en/capture.txt b/doc/en/capture.txt
index 5fbc8e50a..c21ebf54b 100644
--- a/doc/en/capture.txt
+++ b/doc/en/capture.txt
@@ -87,7 +87,9 @@ Accessing captured output from a test function
 
 The ``capsys`` and ``capfd`` fixtures allow to access stdout/stderr
 output created during test execution.  Here is an example test function
-that performs some output related checks::
+that performs some output related checks:
+
+.. code-block:: python
 
     def test_myoutput(capsys): # or use "capfd" for fd-level
         print ("hello")
diff --git a/doc/en/customize.txt b/doc/en/customize.txt
index c2d4c2617..d32712308 100644
--- a/doc/en/customize.txt
+++ b/doc/en/customize.txt
@@ -89,7 +89,9 @@ How to change command line options defaults
 It can be tedious to type the same series of command line options
 every time you use ``pytest``.  For example, if you always want to see
 detailed info on skipped and xfailed tests, as well as have terser "dot"
-progress output, you can write it into a configuration file::
+progress output, you can write it into a configuration file:
+
+.. code-block:: ini
 
     # content of pytest.ini
     # (or tox.ini or setup.cfg)
@@ -117,14 +119,16 @@ Builtin configuration file options
 .. confval:: addopts
 
    Add the specified ``OPTS`` to the set of command line arguments as if they
-   had been specified by the user. Example: if you have this ini file content::
+   had been specified by the user. Example: if you have this ini file content:
 
-       [pytest]
-       addopts = --maxfail=2 -rf  # exit after 2 failures, report fail info
+   .. code-block:: ini
+
+        [pytest]
+        addopts = --maxfail=2 -rf  # exit after 2 failures, report fail info
 
    issuing ``py.test test_hello.py`` actually means::
 
-       py.test --maxfail=2 -rf test_hello.py
+        py.test --maxfail=2 -rf test_hello.py
 
    Default is to add no options.
 
@@ -142,11 +146,13 @@ Builtin configuration file options
 
    Default patterns are ``'.*', 'CVS', '_darcs', '{arch}', '*.egg'``.
    Setting a ``norecursedirs`` replaces the default.  Here is an example of
-   how to avoid certain directories::
+   how to avoid certain directories:
 
-    # content of setup.cfg
-    [pytest]
-    norecursedirs = .svn _build tmp*
+   .. code-block:: ini
+
+        # content of setup.cfg
+        [pytest]
+        norecursedirs = .svn _build tmp*
 
    This would tell ``pytest`` to not look into typical subversion or
    sphinx-build directories or into any ``tmp`` prefixed directory.
@@ -160,11 +166,13 @@ Builtin configuration file options
 
    One or more name prefixes or glob-style patterns determining which classes
    are considered for test collection. Here is an example of how to collect
-   tests from classes that end in ``Suite``::
+   tests from classes that end in ``Suite``:
 
-    # content of pytest.ini
-    [pytest]
-    python_classes = *Suite
+   .. code-block:: ini
+
+        # content of pytest.ini
+        [pytest]
+        python_classes = *Suite
 
    Note that ``unittest.TestCase`` derived classes are always collected
    regardless of this option, as ``unittest``'s own collection framework is used
@@ -174,11 +182,13 @@ Builtin configuration file options
 
    One or more name prefixes or glob-patterns determining which test functions
    and methods are considered tests. Here is an example of how
-   to collect test functions and methods that end in ``_test``::
+   to collect test functions and methods that end in ``_test``:
 
-    # content of pytest.ini
-    [pytest]
-    python_functions = *_test
+   .. code-block:: ini
+
+        # content of pytest.ini
+        [pytest]
+        python_functions = *_test
 
    Note that this has no effect on methods that live on a ``unittest
    .TestCase`` derived class, as ``unittest``'s own collection framework is used
diff --git a/doc/en/doctest.txt b/doc/en/doctest.txt
index 73537a7d3..e33fed676 100644
--- a/doc/en/doctest.txt
+++ b/doc/en/doctest.txt
@@ -15,7 +15,9 @@ python test modules)::
     py.test --doctest-modules
 
 You can make these changes permanent in your project by
-putting them into a pytest.ini file like this::
+putting them into a pytest.ini file like this:
+
+.. code-block:: ini
 
     # content of pytest.ini
     [pytest]
diff --git a/doc/en/fixture.txt b/doc/en/fixture.txt
index 3b1bcb70e..55b79b37a 100644
--- a/doc/en/fixture.txt
+++ b/doc/en/fixture.txt
@@ -232,7 +232,9 @@ traceback.  As a result, the two test functions using ``smtp`` run as
 quick as a single one because they reuse the same instance.
 
 If you decide that you rather want to have a session-scoped ``smtp``
-instance, you can simply declare it::
+instance, you can simply declare it:
+
+.. code-block:: python
 
     @pytest.fixture(scope="session")
     def smtp(...):
@@ -669,20 +671,25 @@ to verify our fixture is activated and the tests pass::
     ..
     2 passed in 0.12 seconds
 
-You can specify multiple fixtures like this::
+You can specify multiple fixtures like this:
+
+.. code-block:: python
 
     @pytest.mark.usefixtures("cleandir", "anotherfixture")
 
 and you may specify fixture usage at the test module level, using
-a generic feature of the mark mechanism::
+a generic feature of the mark mechanism:
+
+.. code-block:: python
 
     pytestmark = pytest.mark.usefixtures("cleandir")
 
 Lastly you can put fixtures required by all tests in your project
-into an ini-file::
+into an ini-file:
+
+.. code-block:: ini
 
     # content of pytest.ini
-
     [pytest]
     usefixtures = cleandir
 
diff --git a/doc/en/funcarg_compare.txt b/doc/en/funcarg_compare.txt
index e951f87ca..4d2331787 100644
--- a/doc/en/funcarg_compare.txt
+++ b/doc/en/funcarg_compare.txt
@@ -205,7 +205,7 @@ fixtures:
   ``request.cached_setup()`` calls and allowed using other funcargs via 
   ``request.getfuncargvalue()`` calls.  These intricate APIs made it hard 
   to do proper parametrization and implement resource caching. The
-  new :py:func:`pytest.fixture`` decorator allows to declare the scope
+  new :py:func:`pytest.fixture` decorator allows to declare the scope
   and let pytest figure things out for you.
 
 * if you used parametrization and funcarg factories which made use of
diff --git a/doc/en/monkeypatch.txt b/doc/en/monkeypatch.txt
index fa2b250df..4155a3a34 100644
--- a/doc/en/monkeypatch.txt
+++ b/doc/en/monkeypatch.txt
@@ -44,7 +44,6 @@ If you want to prevent the "requests" library from performing http
 requests in all your tests, you can do::
 
     # content of conftest.py
-
     import pytest
     @pytest.fixture(autouse=True)
     def no_requests(monkeypatch):
diff --git a/doc/en/parametrize.txt b/doc/en/parametrize.txt
index 09849fbd6..35f93f3dd 100644
--- a/doc/en/parametrize.txt
+++ b/doc/en/parametrize.txt
@@ -30,7 +30,9 @@ pytest supports test parametrization in several well-integrated ways:
 
 .. regendoc: wipe
 
-.. versionadded:: 2.2, improved in 2.4
+.. versionadded:: 2.2
+.. versionchanged:: 2.4
+    Several improvements.
 
 The builtin ``pytest.mark.parametrize`` decorator enables
 parametrization of arguments for a test function.  Here is a typical example
@@ -199,25 +201,7 @@ The **metafunc** object
 -------------------------------------------
 
 .. currentmodule:: _pytest.python
+.. autoclass:: Metafunc
 
-metafunc objects are passed to the ``pytest_generate_tests`` hook.
-They help to inspect a testfunction and to generate tests
-according to test configuration or values specified
-in the class or module where a test function is defined:
-
-``metafunc.fixturenames``: set of required function arguments for given function
-
-``metafunc.function``: underlying python test function
-
-``metafunc.cls``: class object where the test function is defined in or None.
-
-``metafunc.module``: the module object where the test function is defined in.
-
-``metafunc.config``: access to command line opts and general config
-
-``metafunc.funcargnames``: alias for ``fixturenames``, for pre-2.3 compatibility
-
-.. automethod:: Metafunc.parametrize
-.. automethod:: Metafunc.addcall(funcargs=None,id=_notexists,param=_notexists)
-
-
+    .. automethod:: Metafunc.parametrize
+    .. automethod:: Metafunc.addcall(funcargs=None,id=_notexists,param=_notexists)
diff --git a/doc/en/projects.txt b/doc/en/projects.txt
index 34a82b4c2..76d004916 100644
--- a/doc/en/projects.txt
+++ b/doc/en/projects.txt
@@ -81,4 +81,5 @@ Some organisations using pytest
 * `Open End, Gothenborg <http://www.openend.se>`_
 * `Laboratory of Bioinformatics, Warsaw <http://genesilico.pl/>`_
 * `merlinux, Germany <http://merlinux.eu>`_
+* `ESSS, Brazil <http://www.esss.com.br>`_
 * many more ... (please be so kind to send a note via :ref:`contact`)
diff --git a/doc/en/recwarn.txt b/doc/en/recwarn.txt
index faa1ad761..c07a2cbe7 100644
--- a/doc/en/recwarn.txt
+++ b/doc/en/recwarn.txt
@@ -23,8 +23,13 @@ self-contained test::
 
 The ``recwarn`` function argument provides these methods:
 
-* ``pop(category=None)``: return last warning matching the category.
-* ``clear()``: clear list of warnings
+.. method:: pop(category=None)
+
+    Return last warning matching the category.
+
+.. method:: clear()
+
+    Clear list of warnings
 
 
 .. _ensuring_function_triggers:
@@ -33,8 +38,7 @@ Ensuring a function triggers a deprecation warning
 -------------------------------------------------------
 
 You can also call a global helper for checking
-that a certain function call triggers a Deprecation
-warning::
+that a certain function call triggers a ``DeprecationWarning``::
 
     import pytest
 
diff --git a/doc/en/release.txt b/doc/en/release.txt
index a2c24722f..b8345773a 100644
--- a/doc/en/release.txt
+++ b/doc/en/release.txt
@@ -11,7 +11,7 @@ For doing a release of pytest (status April 2015) this rough checklist is used:
 3. write ``doc/en/announce/release-VERSION.txt``
    (usually copying from an earlier release version).
 
-4. regenerate doc examples with ``tox -e regen`` and check with ``hg diff``
+4. regenerate doc examples with ``tox -e regen`` and check with ``git diff``
    if the differences show regressions.  It's a bit of a manual process because
    there a large part of the diff is about pytest headers or differences in
    speed ("tests took X.Y seconds"). (XXX automate doc/example diffing to ignore
@@ -40,9 +40,9 @@ For doing a release of pytest (status April 2015) this rough checklist is used:
                                # browse to pytest.org to see
 
      devpi push pytest-VERSION pypi:NAME
-     hg ci -m "... finalized pytest-VERSION"
-     hg tag VERSION
-     hg push
+     git commit -a -m "... finalized pytest-VERSION"
+     git tag VERSION
+     git push
 
 9. send out release announcement to pytest-dev@python.org,
     testing-in-python@lists.idyll.org and python-announce-list@python.org .
diff --git a/doc/en/skipping.txt b/doc/en/skipping.txt
index b3bd4e5a8..e8a36186a 100644
--- a/doc/en/skipping.txt
+++ b/doc/en/skipping.txt
@@ -107,10 +107,11 @@ As with the class-decorator, the ``pytestmark`` special name tells
 ``pytest`` to apply it to each test function in the class.
 
 If you want to skip all test functions of a module, you must use
-the ``pytestmark`` name on the global level::
+the ``pytestmark`` name on the global level:
+
+.. code-block:: python
 
     # test_module.py
-
     pytestmark = pytest.mark.skipif(...)
 
 If multiple "skipif" decorators are applied to a test function, it
diff --git a/doc/en/status.txt b/doc/en/status.txt
index e46b7481f..3c7bf70ea 100644
--- a/doc/en/status.txt
+++ b/doc/en/status.txt
@@ -1,5 +1,5 @@
 pytest development status
 ================================
 
-https://drone.io/bitbucket.org/pytest-dev/pytest
+https://travis-ci.org/pytest-dev/pytest
 
diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index e774ebef6..9984a2ac9 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -93,10 +93,10 @@ interactive use, this allows one to drop into postmortem debugging with
 any debug tool. One can also manually access the exception information,
 for example::
 
-    >> import sys
-    >> sys.last_traceback.tb_lineno
+    >>> import sys
+    >>> sys.last_traceback.tb_lineno
     42
-    >> sys.last_value
+    >>> sys.last_value
     AssertionError('assert result == "ok"',)
 
 Setting a breakpoint / aka ``set_trace()``
diff --git a/doc/en/writing_plugins.txt b/doc/en/writing_plugins.txt
index 928cc193e..240b85b37 100644
--- a/doc/en/writing_plugins.txt
+++ b/doc/en/writing_plugins.txt
@@ -239,7 +239,9 @@ When we implement a ``pytest_collection_modifyitems`` function in our plugin
 pytest will during registration verify that you use argument
 names which match the specification and bail out if not.
 
-Let's look at a possible implementation::
+Let's look at a possible implementation:
+
+.. code-block:: python
 
     def pytest_collection_modifyitems(config, items):
         # called after collectin is completed
@@ -315,7 +317,9 @@ For any given hook specification there may be more than one
 implementation and we thus generally view ``hook`` execution as a
 ``1:N`` function call where ``N`` is the number of registered functions.
 There are ways to influence if a hook implementation comes before or
-after others, i.e.  the position in the ``N``-sized list of functions::
+after others, i.e.  the position in the ``N``-sized list of functions:
+
+.. code-block:: python
 
     # Plugin 1
     @pytest.hookimpl_spec(tryfirst=True)