From 1e9f6192f65ee0b72132d3348b116a8edb8bd940 Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Tue, 2 Feb 2021 08:39:50 +0100 Subject: [PATCH] Rename conan.cfg to global.conf (#2008) * conan.cfg to global.conf * rename file * fix format * fix files * fix title --- reference/config_files.rst | 2 +- .../config_files/{conan_cfg.rst => global_conf.rst} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename reference/config_files/{conan_cfg.rst => global_conf.rst} (79%) diff --git a/reference/config_files.rst b/reference/config_files.rst index fbf6208afa5..2c8f09b8041 100644 --- a/reference/config_files.rst +++ b/reference/config_files.rst @@ -12,7 +12,7 @@ These are the most important configuration files, used to customize conan. config_files/artifacts.properties config_files/client_certificates config_files/conan.conf - config_files/conan_cfg + config_files/global_conf config_files/conandata.yml config_files/default_profile config_files/editable_layout diff --git a/reference/config_files/conan_cfg.rst b/reference/config_files/global_conf.rst similarity index 79% rename from reference/config_files/conan_cfg.rst rename to reference/config_files/global_conf.rst index 270eb74b1b3..ba26cc4f34d 100644 --- a/reference/config_files/conan_cfg.rst +++ b/reference/config_files/global_conf.rst @@ -1,14 +1,14 @@ -.. _conan_cfg: +.. _global_conf: -conan.cfg -========= +global.conf +=========== .. warning:: This new configuration mechanism is an **experimental** feature subject to breaking changes in future releases. -The **conan.cfg** file is located in the Conan user home directory. +The **global.conf** file is located in the Conan user home directory. Global configuration -------------------- @@ -21,8 +21,8 @@ Global configuration Tools configurations -------------------- -Tools and user configurations allows them to be defined both in the *conan.cfg* file and in profile files. Profile values will -have priority over globally defined ones in *conan.cfg*, and can be defined as: +Tools and user configurations allows them to be defined both in the *global.conf* file and in profile files. Profile values will +have priority over globally defined ones in *global.conf*, and can be defined as: .. code-block:: text