Skip to content

Commit

Permalink
Auto merge of #11139 - weihanglo:issue/11041, r=epage
Browse files Browse the repository at this point in the history
Call out that not all config values can be set via env vars
  • Loading branch information
bors committed Sep 23, 2022
2 parents 254cf2f + 7c2acdb commit 13ae438
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/doc/src/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ variable.

Environment variables will take precedence over TOML configuration files.
Currently only integer, boolean, string and some array values are supported to
be defined by environment variables. Descriptions below indicate which keys
support environment variables.
be defined by environment variables. [Descriptions below](#configuration-keys)
indicate which keys support environment variables and otherwise they are not
supported due to [technicial issues](https://github.com/rust-lang/cargo/issues/5416).

In addition to the system above, Cargo recognizes a few other specific
[environment variables][env].
Expand Down
6 changes: 3 additions & 3 deletions src/doc/src/reference/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ system:

#### Configuration environment variables

Cargo reads environment variables for configuration values. See the
[configuration chapter][config-env] for more details. In summary, the
supported environment variables are:
Cargo reads environment variables for some configuration values.
See the [configuration chapter][config-env] for more details.
In summary, the supported environment variables are:

* `CARGO_ALIAS_<name>` — Command aliases, see [`alias`].
* `CARGO_BUILD_JOBS` — Number of parallel jobs, see [`build.jobs`].
Expand Down

0 comments on commit 13ae438

Please sign in to comment.