merge from master again

2016-06-22 16:03:52 +02:00
parent e96cd51a2a f7585c7549
commit 18ef7de96b
6 changed files with 43 additions and 5 deletions
@@ -222,9 +222,9 @@ Inspecting Cache content
 -------------------------------

 You can always peek at the content of the cache using the
-``--cache-clear`` command line option::
+``--cache-show`` command line option::

-    $ pytest --cache-clear
+    $ py.test --cache-show
    ======= test session starts ========
    platform linux -- Python 3.5.1, pytest-2.9.2, py-1.4.31, pluggy-0.3.1
    rootdir: $REGENDOC_TMPDIR, inifile: