From 536177bb56a500e23bf438b93d6760f8479df134 Mon Sep 17 00:00:00 2001 From: marc Date: Thu, 19 Dec 2019 10:35:15 +0100 Subject: [PATCH] fix typos in docs --- README.rst | 2 +- doc/en/announce/release-2.3.0.rst | 4 ++-- doc/en/announce/release-2.5.0.rst | 2 +- doc/en/announce/release-2.7.0.rst | 2 +- doc/en/changelog.rst | 6 +++--- doc/en/historical-notes.rst | 2 +- doc/en/index.rst | 2 +- doc/en/py27-py34-deprecation.rst | 2 +- doc/en/sponsor.rst | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 53e643a5b..15ab4f0bc 100644 --- a/README.rst +++ b/README.rst @@ -117,7 +117,7 @@ It provide tools to raise money and share your finances in full transparency. It is the platform of choice for individuals and companies that want to make one-time or monthly donations directly to the project. -See more datails in the `pytest collective`_. +See more details in the `pytest collective`_. .. _Open Collective: https://opencollective.com .. _pytest collective: https://opencollective.com/pytest diff --git a/doc/en/announce/release-2.3.0.rst b/doc/en/announce/release-2.3.0.rst index 5fb253670..1b9d0dcc1 100644 --- a/doc/en/announce/release-2.3.0.rst +++ b/doc/en/announce/release-2.3.0.rst @@ -3,13 +3,13 @@ pytest-2.3: improved fixtures / better unittest integration pytest-2.3 comes with many major improvements for fixture/funcarg management and parametrized testing in Python. It is now easier, more efficient and -more predicatable to re-run the same tests with different fixture +more predictable to re-run the same tests with different fixture instances. Also, you can directly declare the caching "scope" of fixtures so that dependent tests throughout your whole test suite can re-use database or other expensive fixture objects with ease. Lastly, it's possible for fixture functions (formerly known as funcarg factories) to use other fixtures, allowing for a completely modular and -re-useable fixture design. +re-usable fixture design. For detailed info and tutorial-style examples, see: diff --git a/doc/en/announce/release-2.5.0.rst b/doc/en/announce/release-2.5.0.rst index 29064e05e..bc83fdc12 100644 --- a/doc/en/announce/release-2.5.0.rst +++ b/doc/en/announce/release-2.5.0.rst @@ -91,7 +91,7 @@ holger krekel it might be the cause for other finalizers to fail. - fix ordering when mock.patch or other standard decorator-wrappings - are used with test methods. This fixues issue346 and should + are used with test methods. This fixes issue346 and should help with random "xdist" collection failures. Thanks to Ronny Pfannschmidt and Donald Stufft for helping to isolate it. diff --git a/doc/en/announce/release-2.7.0.rst b/doc/en/announce/release-2.7.0.rst index 8952ff50f..cf798ff2c 100644 --- a/doc/en/announce/release-2.7.0.rst +++ b/doc/en/announce/release-2.7.0.rst @@ -35,7 +35,7 @@ holger krekel - fix issue435: make reload() work when assert rewriting is active. Thanks Daniel Hahler. -- fix issue616: conftest.py files and their contained fixutres are now +- fix issue616: conftest.py files and their contained fixtures are now properly considered for visibility, independently from the exact current working directory and test arguments that are used. Many thanks to Eric Siegerman and his PR235 which contains diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst index 46fa240e0..88f07ba69 100644 --- a/doc/en/changelog.rst +++ b/doc/en/changelog.rst @@ -5343,7 +5343,7 @@ time or change existing behaviors in order to make them less surprising/more use Thanks Ronny Pfannschmidt for most of the merging work. - "-r" option now accepts "a" to include all possible reports, similar - to passing "fEsxXw" explicitly (isse960). + to passing "fEsxXw" explicitly (issue960). Thanks Abhijeet Kasurde for the PR. - avoid python3.5 deprecation warnings by introducing version @@ -5633,7 +5633,7 @@ time or change existing behaviors in order to make them less surprising/more use - fix issue435: make reload() work when assert rewriting is active. Thanks Daniel Hahler. -- fix issue616: conftest.py files and their contained fixutres are now +- fix issue616: conftest.py files and their contained fixtures are now properly considered for visibility, independently from the exact current working directory and test arguments that are used. Many thanks to Eric Siegerman and his PR235 which contains @@ -7180,7 +7180,7 @@ Bug fixes: - streamlined plugin loading: order is now as documented in customize.html: setuptools, ENV, commandline, conftest. - also setuptools entry point names are turned to canonical namees ("pytest_*") + also setuptools entry point names are turned to canonical names ("pytest_*") - automatically skip tests that need 'capfd' but have no os.dup diff --git a/doc/en/historical-notes.rst b/doc/en/historical-notes.rst index c8403728f..ba96d32ab 100644 --- a/doc/en/historical-notes.rst +++ b/doc/en/historical-notes.rst @@ -111,7 +111,7 @@ More details can be found in the `original PR `__. +The technical aspects of the Python 2.7 and 3.4 support plan (such as when releases will occur, how to backport fixes, etc) is described in issue `#5275 `__. diff --git a/doc/en/sponsor.rst b/doc/en/sponsor.rst index 1023928b3..8362a7f0a 100644 --- a/doc/en/sponsor.rst +++ b/doc/en/sponsor.rst @@ -17,7 +17,7 @@ It provide tools to raise money and share your finances in full transparency. It is the platform of choice for individuals and companies that want to make one-time or monthly donations directly to the project. -See more datails in the `pytest collective`_. +See more details in the `pytest collective`_. .. _Tidelift: https://tidelift.com