Skip to content

Commit

Permalink
Auto merge of #8125 - ehuss:doc-config-toml, r=alexcrichton
Browse files Browse the repository at this point in the history
Add note about .cargo/config support.

I think it would be good to have some mention that Cargo also supports `.cargo/config` files.  This is still the predominant way Cargo is used, and there is a ton of documentation, projects, and examples that still use the old form.
  • Loading branch information
bors committed Apr 17, 2020
2 parents 1638705 + d20d395 commit 03f11e8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/doc/src/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ together. Numbers, strings, and booleans will use the value in the deeper
config directory taking precedence over ancestor directories, where the
home directory is the lowest priority. Arrays will be joined together.

> **Note:** Cargo also reads config files without the `.toml` extension, such as
> `.cargo/config`. Support for the `.toml` extension was added in version 1.39
> and is the preferred form. If both files exist, Cargo will use the file
> without the extension.
### Configuration format

Configuration files are written in the [TOML format][toml] (like the
Expand Down

0 comments on commit 03f11e8

Please sign in to comment.