Merge remote-tracking branch 'upstream/master'

Author: nicoddemus

AUTHORS

@@ -88,6 +88,7 @@ Martin K. Scherer
 Martin Prusse
 Matt Bachmann
 Matt Williams
+Matthias Hafner
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom

CHANGELOG.rst

@@ -248,7 +248,8 @@ time or change existing behaviors in order to make them less surprising/more use
 
 * Refined logic for determining the ``rootdir``, considering only valid
   paths which fixes a number of issues: `#1594`_, `#1435`_ and `#1471`_.
-  Thanks to `@blueyed`_ and `@davehunt`_ for the PR.
+  Updated the documentation according to current behavior. Thanks to 
+  `@blueyed`_, `@davehunt`_ and `@matthiasha`_ for the PR.
 
 * Always include full assertion explanation. The previous behaviour was hiding
   sub-expressions that happened to be False, assuming this was redundant information.
@@ -420,6 +421,7 @@ time or change existing behaviors in order to make them less surprising/more use
 .. _@tramwaj29: https://github.com/tramwaj29
 .. _@txomon: https://github.com/txomon
 .. _@Vogtinator: https://github.com/Vogtinator
+.. _@matthiasha: https://github.com/matthiasha
 
 
 2.9.2

doc/en/customize.rst

@@ -48,6 +48,16 @@ Here is the algorithm which finds the rootdir from ``args``:
   directory. This allows to work with pytest in structures that are not part of
   a package and don't have any particular ini-file configuration.
 
+If no ``args`` are given, pytest collects test below the current working
+directory and also starts determining the rootdir from there. 
+
+:warning: custom pytest plugin commandline arguments may include a path, as in
+    ``pytest --log-output ../../test.log args``. Then ``args`` is mandatory,
+    otherwise pytest uses the folder of test.log for rootdir determination
+    (see also `issue 1435 <https://github.com/pytest-dev/pytest/issues/1435>`_).
+    A dot ``.`` for referencing to the current working directory is also
+    possible.
+
 Note that an existing ``pytest.ini`` file will always be considered a match,
 whereas ``tox.ini`` and ``setup.cfg`` will only match if they contain a
 ``[pytest]`` or ``[tool:pytest]`` section, respectively. Options from multiple ini-files candidates are never