Skip to content

Commit

Permalink
Rename conan.cfg to global.conf (#2008)
Browse files Browse the repository at this point in the history
* conan.cfg to global.conf

* rename file

* fix format

* fix files

* fix title
  • Loading branch information
czoido authored Feb 2, 2021
1 parent 145c007 commit 1e9f619
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion reference/config_files.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
--------------------
Expand All @@ -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
Expand Down

0 comments on commit 1e9f619

Please sign in to comment.