Merge pull request #1817 from nicoddemus/regendoc-run

The-Compiler · web-flow · commit be9356aebab4 · 2016-08-18T15:31:03.000+02:00
Run regendoc for 3.0 release
diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst
@@ -121,8 +121,6 @@ You can ask for available builtin or project-custom
         test function or fixture has finished. The ``raising``
         parameter determines if a KeyError or AttributeError
         will be raised if the set/deletion operation has no target.
-        
-        This fixture is ``invocation``-scoped.
     recwarn
         Return a WarningsRecorder instance that provides these methods:
         
diff --git a/doc/en/example/pythoncollection.rst b/doc/en/example/pythoncollection.rst
@@ -118,7 +118,7 @@ then the test collection looks like this::
     $ pytest --collect-only
     ======= test session starts ========
     platform linux -- Python 3.5.2, pytest-3.0.0, py-1.4.31, pluggy-0.3.1
-    rootdir: $REGENDOC_TMPDIR, inifile: setup.cfg
+    rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 2 items
     <Module 'check_myapp.py'>
       <Class 'CheckMyApp'>
diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst
@@ -361,7 +361,7 @@ get on the terminal - we are working on that):
     >   int(s)
     E   ValueError: invalid literal for int() with base 10: 'qwe'
     
-    <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python.py:1176>:1: ValueError
+    <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python.py:1174>:1: ValueError
     _______ TestRaises.test_raises_doesnt ________
     
     self = <failure_demo.TestRaises object at 0xdeadbeef>
diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
@@ -501,8 +501,8 @@ We can run this::
     file $REGENDOC_TMPDIR/b/test_error.py, line 1
       def test_root(db):  # no db here, will error out
     E       fixture 'db' not found
-            available fixtures: cache, capfd, capsys, doctest_namespace, monkeypatch, pytestconfig, record_xml_property, recwarn, tmpdir, tmpdir_factory
-            use 'pytest --fixtures [testpath]' for help on them.
+    >       available fixtures: cache, capfd, capsys, doctest_namespace, monkeypatch, pytestconfig, record_xml_property, recwarn, tmpdir, tmpdir_factory
+    >       use 'pytest --fixtures [testpath]' for help on them.
     
     $REGENDOC_TMPDIR/b/test_error.py:1
     ======= FAILURES ========
