Merge branch 'spelling' into 'master'

Spelling and grammar fixes

See merge request pycqa/flake8!232

5 files changed, 5 insertions, 5 deletions

diff --git a/.pylintrc b/.pylintrc
index f778dd4..d6e52a8 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -349,7 +349,7 @@ min-public-methods=2
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20
 
-# Maximum number of boolean expressions in a if statement
+# Maximum number of boolean expressions in an if statement
 max-bool-expr=5
 
 
diff --git a/docs/source/internal/contributing.rst b/docs/source/internal/contributing.rst
index 023a553..33757d0 100644
--- a/docs/source/internal/contributing.rst
+++ b/docs/source/internal/contributing.rst
@@ -2,7 +2,7 @@
  Contributing to Flake8
 ========================
 
-There are many ways to contriubte to |Flake8|, and we encourage them all:
+There are many ways to contribute to |Flake8|, and we encourage them all:
 
 - contributing bug reports and feature requests
 
diff --git a/docs/source/plugin-development/formatters.rst b/docs/source/plugin-development/formatters.rst
index 480ada0..8133567 100644
--- a/docs/source/plugin-development/formatters.rst
+++ b/docs/source/plugin-development/formatters.rst
@@ -33,7 +33,7 @@ Let's do that next.
             return 'Example formatter: {0!r}'.format(error)
 
 With that we're done. Obviously this isn't a very useful formatter, but it
-should highlight the simplicitly of creating a formatter with Flake8. If we
+should highlight the simplicity of creating a formatter with Flake8. If we
 wanted to instead create a formatter that aggregated the results and returned
 XML, JSON, or subunit we could also do that. |Flake8| interacts with the
 formatter in two ways:
diff --git a/setup.py b/setup.py
index 0b8ca2c..33833c3 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setuptools.setup(
         ],
         'flake8.extension': [
             'F = flake8.plugins.pyflakes:FlakesChecker',
-            # PEP-0008 checks provied by PyCQA/pycodestyle
+            # PEP-0008 checks provided by PyCQA/pycodestyle
             PEP8_PLUGIN('tabs_or_spaces'),
             PEP8_PLUGIN('tabs_obsolete'),
             PEP8_PLUGIN('trailing_whitespace'),
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index e96acb8..b50580b 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -74,7 +74,7 @@ class Violation(_Violation):
 
     def is_inline_ignored(self, disable_noqa):
         # type: (Violation) -> bool
-        """Determine if an comment has been added to ignore this line.
+        """Determine if a comment has been added to ignore this line.
 
         :param bool disable_noqa:
             Whether or not users have provided ``--disable-noqa``.