Merge pull request #9506 from eamanu/fix-9505

pytest-dev · Jan 13, 2022 · e9ed482 · e9ed482
2 parents f1aa7a2 + 5c2d752
commit e9ed482
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog/9505.trivial.rst b/changelog/9505.trivial.rst
@@ -0,0 +1,2 @@
+Clarify where the configuration files are located. To avoid confusions documentation mentions
+that configuration file is located in the root of the repository.
diff --git a/doc/en/reference/customize.rst b/doc/en/reference/customize.rst
@@ -20,8 +20,7 @@ Configuration file formats
 --------------------------
 
 Many :ref:`pytest settings <ini options ref>` can be set in a *configuration file*, which
-by convention resides on the root of your repository or in your
-tests folder.
+by convention resides in the root directory of your repository.
 
 A quick example of the configuration files supported by pytest: