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 a815bf9814f25f7d9ec2c92cb4255ee1aa4f673b..13793cf349524d5fadfaf6645327f081caa4366a 100644 (file)
--- 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 679bc5f9bc96ecb8553bf42c8a77d854ef83c1a4..472d5ca0d3a377548bd3daf3274bc33b97ea65f1 100644 (file)
--- 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`