From 3afb979b3fdd7d6cc43f283f46e20a9dfe189b7a Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Mon, 16 Jan 2023 23:48:10 +0100 Subject: [PATCH 1/2] Improve documention on the `RFM_CONFIG_PATH` --- docs/manpage.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manpage.rst b/docs/manpage.rst index 96a6d9d478..20bfb1ef6c 100644 --- a/docs/manpage.rst +++ b/docs/manpage.rst @@ -765,9 +765,9 @@ Miscellaneous options This option can also be set using the :envvar:`RFM_CONFIG_FILES` environment variable. - In order to determine its final configuration, ReFrame first loads the builtin configuration file unconditionally and then starts looking for configuration files in the :envvar:`RFM_CONFIG_PATH`. - For each directory in the :envvar:`RFM_CONFIG_PATH`, ReFrame looks for files named ``setting.py`` or ``setting.json`` and loads them. - If both a ``settings.py`` and a ``settings.json`` file are found, the Python configuration will be preferred. + In order to determine its final configuration, ReFrame first loads the builtin configuration file unconditionally and then starts looking for possible configuration file locations defined in the :envvar:`RFM_CONFIG_PATH` environment variable. + For each directory defined in the :envvar:`RFM_CONFIG_PATH`, ReFrame looks for a file named ``settings.py`` or ``setting.json`` inside it and loads it. + If both a ``settings.py`` and a ``settings.json`` files are found, the Python configuration will be preferred. ReFrame, finally, processes any configuration files specified in the command line or in the :envvar:`RFM_CONFIG_FILES` environment variable. .. versionchanged:: 4.0.0 From a1c21018daa81a443c9220931ee9264e77505c57 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Fri, 20 Jan 2023 17:54:00 +0100 Subject: [PATCH 2/2] Fix typo in docs --- docs/manpage.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpage.rst b/docs/manpage.rst index 20bfb1ef6c..1f66cf32d8 100644 --- a/docs/manpage.rst +++ b/docs/manpage.rst @@ -766,7 +766,7 @@ Miscellaneous options This option can also be set using the :envvar:`RFM_CONFIG_FILES` environment variable. In order to determine its final configuration, ReFrame first loads the builtin configuration file unconditionally and then starts looking for possible configuration file locations defined in the :envvar:`RFM_CONFIG_PATH` environment variable. - For each directory defined in the :envvar:`RFM_CONFIG_PATH`, ReFrame looks for a file named ``settings.py`` or ``setting.json`` inside it and loads it. + For each directory defined in the :envvar:`RFM_CONFIG_PATH`, ReFrame looks for a file named ``settings.py`` or ``settings.json`` inside it and loads it. If both a ``settings.py`` and a ``settings.json`` files are found, the Python configuration will be preferred. ReFrame, finally, processes any configuration files specified in the command line or in the :envvar:`RFM_CONFIG_FILES` environment variable.