Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify that .cargo/config files are unified #4485

Merged
merged 1 commit into from
Sep 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/doc/book/src/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion src/doc/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down