Skip to content

Commit 522bdb3

Browse files
scopjugmac00
authored andcommitted
Spelling and grammar fixes
1 parent 5192d3d commit 522bdb3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docs/changelog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ Bugfixes - 4.0.0a7
363363
- Enable setting a different ``upstream`` repository for the coverage diff report.
364364
This has been hardcoded to ``upstream/rewrite`` until now.
365365
by :user:`jugmac00`. (:issue:`1972`)
366-
- Enable replacements (a.k.a section substitions) for section names containing a dash in sections
366+
- Enable replacements (a.k.a section substitutions) for section names containing a dash in sections
367367
without the ``testenv:`` prefix - by :user:`jugmac00`, :user:`obestwalter`, :user:`eumiro`. (:issue:`1985`)
368368
- Fix legacy list env command for empty/missing envlist - by :user:`jugmac00`. (:issue:`1987`)
369369
- Requirements and constraints files handling got reimplemented, which should fix all open issues related to this area
@@ -413,7 +413,7 @@ Features - 4.0.0a6
413413
final report will be soon printed and makes the status update redundant) - by :user:`gaborbernat`. (:issue:`1909`)
414414
- The ``_TOX_SHOW_THREAD`` environment variable can be used to print alive threads when tox exists (useful to debug
415415
when tox hangs because of some non-finished thread) and also now prints the pid of the local subprocess when reporting
416-
the outcome of a execution - by :user:`gaborbernat`. (:pull:`1915`)
416+
the outcome of an execution - by :user:`gaborbernat`. (:pull:`1915`)
417417

418418
Bugfixes - 4.0.0a6
419419
~~~~~~~~~~~~~~~~~~

docs/config.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Out of box tox supports three configuration locations prioritized in the followi
1515
2. ``pyproject.toml``,
1616
3. ``setup.cfg``.
1717

18-
As far as the configuration format at the moment we only support a *ini-style*. ``tox.ini`` and ``setup.cfg`` are by
19-
nature such file, while in ``pyprojec.toml`` currently you can only inline the *ini-style* config.
18+
With regards to the configuration format, at the moment we only support *ini-style*. ``tox.ini`` and ``setup.cfg`` are by
19+
nature such files, while in ``pyproject.toml`` currently you can only inline the *ini-style* config.
2020

2121
Note that ``setup.cfg`` requires the content to be under the ``tox:tox`` and ``testenv`` sections and is otherwise
2222
ignored. ``pyproject.toml`` on the other hand is in TOML format. However, one can inline the *ini-style* format under
@@ -72,7 +72,7 @@ to the default value for that setting. For example:
7272
7373
``pyproject.toml``
7474
~~~~~~~~~~~~~~~~~~
75-
You can inline a ``tox.ini`` style configuration under the ``tool:tox`` section and ``legacy_tox_ini`` key.
75+
You can inline a ``tox.ini`` style configuration under the ``tool.tox`` section and ``legacy_tox_ini`` key.
7676

7777
Below you find the specification for the *ini-style* format, but you might want to skim some
7878
examples first and use this page as a reference.
@@ -223,7 +223,7 @@ Python language core options
223223
tox allows setting the Python version for an environment via the :ref:`basepython` setting. If that's not set tox
224224
can set a default value from the environment name (e.g. ``py310`` implies Python 3.10). Matching up the Python
225225
version with the environment name has became expected at this point, leading to surprises when some configs don't
226-
do so. To help with sanity of users a error will be raised whenever the environment name version does not matches
226+
do so. To help with sanity of users, an error will be raised whenever the environment name version does not match
227227
up with this expectation.
228228

229229
Furthermore, we allow hard enforcing this rule by setting this flag to ``true``. In such cases we ignore the

docs/user_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Then we define separately what should the formatting environment (``testenv:form
6060
For testing the project we use the ``py310`` environment, for which we:
6161

6262
- define a text description of the environment,
63-
- specify that requires ``pytest`` ``7`` ot later together with the :pypi:`pytest-sugar` project,
63+
- specify that requires ``pytest`` ``7`` or later together with the :pypi:`pytest-sugar` project,
6464
- and that the tool should be invoked via the ``pytest tests`` CLI command.
6565

6666
``{posargs}`` is a place holder part for the CLI command that allows us to pass additional flags to the pytest

0 commit comments

Comments
 (0)