From efa02cffddba85588993899ee004d1f54244de6b Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 13 Jan 2022 13:52:09 -0300 Subject: [PATCH] Merge pull request #9506 from eamanu/fix-9505 --- changelog/9505.trivial.rst | 2 ++ doc/en/reference/customize.rst | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/9505.trivial.rst diff --git a/changelog/9505.trivial.rst b/changelog/9505.trivial.rst new file mode 100644 index 000000000..51386c226 --- /dev/null +++ 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 index 22ce24b31..fe10ca066 100644 --- a/doc/en/reference/customize.rst +++ b/doc/en/reference/customize.rst @@ -20,8 +20,7 @@ Configuration file formats -------------------------- Many :ref:`pytest settings ` 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: