diff --git a/doc/en/example/nonpython.rst b/doc/en/example/nonpython.rst index 822a5093312..9ac2b508ceb 100644 --- a/doc/en/example/nonpython.rst +++ b/doc/en/example/nonpython.rst @@ -62,7 +62,7 @@ consulted when reporting in ``verbose`` mode. It should return a tuple ``(path, lineno, description)``, where: * ``path`` is the path shown in reports (usually ``self.path`` or ``self.fspath``). -* ``lineno`` is a zero-based line number, or ``0`` when no specific line applies. +* ``lineno`` is the line number, or ``0`` when no specific line applies. * ``description`` is a short label shown for the collected item: .. code-block:: pytest diff --git a/doc/en/how-to/assert.rst b/doc/en/how-to/assert.rst index 43aeb66fdfc..5564aa9ce83 100644 --- a/doc/en/how-to/assert.rst +++ b/doc/en/how-to/assert.rst @@ -432,10 +432,6 @@ Special comparisons are done for a number of cases: * comparing long sequences: first failing indices * comparing dicts: different entries -In string context diffs, lines prefixed with ``-`` come from the left-hand side -of ``assert left == right``, while lines prefixed with ``+`` come from the -right-hand side. - See the :ref:`reporting demo ` for many more examples. Defining your own explanation for failed assertions diff --git a/doc/en/reference/customize.rst b/doc/en/reference/customize.rst index 8f781eab4a5..7a4030d081a 100644 --- a/doc/en/reference/customize.rst +++ b/doc/en/reference/customize.rst @@ -104,7 +104,7 @@ pyproject.toml ] For projects that still run pytest versions older than 6.0, keep - ``minversion`` in ``pytest.ini`` or ``setup.cfg`` too. Those versions + ``minversion`` in ``pytest.ini`` or ``tox.ini`` too. Those versions do not read ``pyproject.toml``. tox.ini