Merge remote-tracking branch 'upstream/master' into merge-master-into-features

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py

doc/en/assert.rst

@@ -287,5 +287,5 @@ For further information, Benjamin Peterson wrote up `Behind the scenes of pytest
    ``--nomagic``.
 
 .. versionchanged:: 3.0
-   Removes the ``--no-assert`` and``--nomagic`` options.
+   Removes the ``--no-assert`` and ``--nomagic`` options.
    Removes the ``--assert=reinterp`` option.

doc/en/fixture.rst

@@ -243,7 +243,9 @@ Fixture finalization / executing teardown code
 
 pytest supports execution of fixture specific finalization code
 when the fixture goes out of scope.  By using a ``yield`` statement instead of ``return``, all
-the code after the *yield* statement serves as the teardown code.::
+the code after the *yield* statement serves as the teardown code:
+
+.. code-block:: python
 
     # content of conftest.py
 
@@ -275,22 +277,23 @@ occur around each single test.  In either case the test
 module itself does not need to change or know about these details
 of fixture setup.
 
-Note that we can also seamlessly use the ``yield`` syntax with ``with`` statements::
+Note that we can also seamlessly use the ``yield`` syntax with ``with`` statements:
+
+.. code-block:: python
 
     # content of test_yield2.py
 
+    import smtplib
     import pytest
 
-    @pytest.fixture
-    def passwd():
-        with open("/etc/passwd") as f:
-            yield f.readlines()
+    @pytest.fixture(scope="module")
+    def smtp(request):
+        with smtplib.SMTP("smtp.gmail.com") as smtp:
+            yield smtp  # provide the fixture value
 
-    def test_has_lines(passwd):
-        assert len(passwd) >= 1
 
-The file ``f`` will be closed after the test finished execution
-because the Python ``file`` object supports finalization when
+The ``smtp`` connection will be closed after the test finished execution
+because the ``smtp`` object automatically closes when
 the ``with`` statement ends.
 
 

doc/en/talks.rst

@@ -4,7 +4,9 @@ Talks and Tutorials
 
 .. sidebar:: Next Open Trainings
 
-   `pytest workshop <http://www.meetup.com/Python-Django-User-Group-Bern/events/235151115/>`_, 8th December 2016, Bern, Switzerland
+   `Professional Testing with Python
+   <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
+   26-28 April 2017, Leipzig, Germany.
 
 .. _`funcargs`: funcargs.html
 

doc/en/writing_plugins.rst

@@ -236,20 +236,31 @@ import ``helper.py`` normally.  The contents of
 Requiring/Loading plugins in a test module or conftest file
 -----------------------------------------------------------
 
-You can require plugins in a test module or a conftest file like this::
+You can require plugins in a test module or a ``conftest.py`` file like this:
 
-    pytest_plugins = "name1", "name2",
+.. code-block:: python
+
+    pytest_plugins = ["name1", "name2"]
 
 When the test module or conftest plugin is loaded the specified plugins
-will be loaded as well.  You can also use dotted path like this::
+will be loaded as well. Any module can be blessed as a plugin, including internal
+application modules:
+
+.. code-block:: python
 
     pytest_plugins = "myapp.testsupport.myplugin"
 
-which will import the specified module as a ``pytest`` plugin.
+``pytest_plugins`` variables are processed recursively, so note that in the example above
+if ``myapp.testsupport.myplugin`` also declares ``pytest_plugins``, the contents
+of the variable will also be loaded as plugins, and so on.
 
-Plugins imported like this will automatically be marked to require
-assertion rewriting using the :func:`pytest.register_assert_rewrite`
-mechanism.  However for this to have any effect the module must not be
+This mechanism makes it easy to share fixtures within applications or even
+external applications without the need to create external plugins using 
+the ``setuptools``'s entry point technique.
+
+Plugins imported by ``pytest_plugins`` will also automatically be marked
+for assertion rewriting (see :func:`pytest.register_assert_rewrite`). 
+However for this to have any effect the module must not be
 imported already; if it was already imported at the time the
 ``pytest_plugins`` statement is processed, a warning will result and
 assertions inside the plugin will not be re-written.  To fix this you