From: Carol (Nichols || Goulding) Date: Tue, 12 Sep 2017 15:01:40 +0000 (-0400) Subject: Clarify that .cargo/config files are unified X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2~56^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b3685ff49496043c842244ccb1a9925ec38ae57;p=cargo.git Clarify that .cargo/config files are unified --- diff --git a/src/doc/book/src/reference/config.md b/src/doc/book/src/reference/config.md index a815bf981..13793cf34 100644 --- a/src/doc/book/src/reference/config.md +++ b/src/doc/book/src/reference/config.md @@ -9,7 +9,7 @@ manifest, see the [manifest format](reference/manifest.html). Cargo allows to have local configuration for a particular project or global configuration (like git). Cargo also extends this ability to a hierarchical strategy. If, for example, Cargo were invoked in `/home/foo/bar/baz`, then the -following configuration files would be probed for: +following configuration files would be probed for and unified in this order: * `/home/foo/bar/baz/.cargo/config` * `/home/foo/bar/.cargo/config` diff --git a/src/doc/config.md b/src/doc/config.md index 679bc5f9b..472d5ca0d 100644 --- a/src/doc/config.md +++ b/src/doc/config.md @@ -9,7 +9,7 @@ manifest, see the [manifest format](manifest.html). Cargo allows to have local configuration for a particular project or global configuration (like git). Cargo also extends this ability to a hierarchical strategy. If, for example, Cargo were invoked in `/home/foo/bar/baz`, then the -following configuration files would be probed for: +following configuration files would be probed for and unified in this order: * `/home/foo/bar/baz/.cargo/config` * `/home/foo/bar/.cargo/config`