Skip to content

Commit

Permalink
Merge branch 'grammar' into 'master'
Browse files Browse the repository at this point in the history
Grammar fixes

See merge request pycqa/flake8!266
  • Loading branch information
asottile committed Nov 11, 2018
2 parents 4439ea2 + dedb741 commit cd75e4e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/source/internal/utils.rst
Expand Up @@ -51,7 +51,7 @@ path if the string has a ``/`` in it. It also removes trailing ``/``\ s.
.. autofunction:: flake8.utils.normalize_paths

This function utilizes :func:`~flake8.utils.parse_comma_separated_list` and
:func:`~flake8.utils.normalize_path` to normalize it's input to a list of
:func:`~flake8.utils.normalize_path` to normalize its input to a list of
strings that should be paths.

.. autofunction:: flake8.utils.stdin_get_value
Expand Down
2 changes: 1 addition & 1 deletion docs/source/plugin-development/cross-compatibility.rst
Expand Up @@ -161,7 +161,7 @@ some plugins. |Flake8| 2.5 and earlier had started monkey-patching pep8's
monkey-patched that. 3.0 has its own internal implementation and uses that but
does not directly provide anything for plugins using pep8 and pycodestyle's
``stdin_get_value`` function. |polyfill| provides this functionality for
plugin developers via it's :mod:`flake8_polyfill.stdin` module.
plugin developers via its :mod:`flake8_polyfill.stdin` module.

If a plugin needs to read the content from stdin, it can do the following:

Expand Down
2 changes: 1 addition & 1 deletion docs/source/user/python-api.rst
Expand Up @@ -11,7 +11,7 @@ be documented here.
Legacy API
==========

When |Flake8| broke it's hard dependency on the tricky internals of
When |Flake8| broke its hard dependency on the tricky internals of
pycodestyle, it lost the easy backwards compatibility as well. To help
existing users of that API we have :mod:`flake8.api.legacy`. This module
includes a couple classes (which are documented below) and a function.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/user/violations.rst
Expand Up @@ -218,7 +218,7 @@ Selecting and Ignoring Simultaneously For Fun and Profit
========================================================

Prior to |Flake8| 3.0, all handling of :option:`flake8 --select` and
:option:`flake8 --ignore` was delegated to pycodestyle. It's handling of the
:option:`flake8 --ignore` was delegated to pycodestyle. Its handling of the
options significantly differs from how |Flake8| 3.0 has been designed.

pycodestyle has always preferred ``--ignore`` over ``--select`` and will
Expand Down
2 changes: 1 addition & 1 deletion src/flake8/plugins/manager.py
Expand Up @@ -339,7 +339,7 @@ def versions(self):

def version_for(plugin):
# (Plugin) -> Union[str, NoneType]
"""Determine the version of a plugin by it's module.
"""Determine the version of a plugin by its module.
:param plugin:
The loaded plugin
Expand Down

0 comments on commit cd75e4e

Please sign in to comment.