Merge branch 'master' into pre-commit-ci-update-config

pytest-dev · Mar 5, 2022 · 3c88460 · 3c88460
2 parents 9634475 + 4d5443f
commit 3c88460
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -279,7 +279,7 @@ This release introduces breaking changes, please refer to the :ref:`Migration fr
 2.6.2
 -----
 
-- Parse comments only in the begining of words (santagada)
+- Parse comments only in the beginning of words (santagada)
 
 2.6.1
 -----

diff --git a/Makefile b/Makefile
@@ -18,6 +18,6 @@ test: develop
 coveralls: coverage
 	coveralls
 
-# clean the development envrironment
+# clean the development environment
 clean:
 	-rm -rf .env
diff --git a/tests/library/test_parent.py b/tests/library/test_parent.py
@@ -1,6 +1,6 @@
 """Test givens declared in the parent conftest and plugin files.
 
-Check the parent givens are collected and overriden in the local conftest.
+Check the parent givens are collected and overridden in the local conftest.
 """
 import textwrap