Skip to content

Commit

Permalink
Spell “Cargo” consistently
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanUkhov committed Nov 18, 2015
1 parent 6c8f430 commit bf9b784
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/doc/config.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
% Configuration - Cargo Documentation

This document will explain how cargo’s configuration system works, as well as
This document will explain how Cargo’s configuration system works, as well as
available keys or configuration. For configuration of a project through its
manifest, see the [manifest format](manifest.html).

# Hierarchical structure

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
strategy. If, for example, Cargo were invoked in `/home/foo/bar/baz`, then the
following configuration files would be probed for:

* `/home/foo/bar/baz/.cargo/config`
Expand Down Expand Up @@ -59,7 +59,7 @@ vcs = "none"
# literal string "$triple", and it will apply whenever that target triple is
# being compiled to.
[target]
# For cargo builds which do not mention --target, these are the ar/linker tools
# For Cargo builds which do not mention --target, these are the ar/linker tools
# which are passed to rustc to use (via `-C ar=` and `-C linker=`). By default
# these flags are not passed to the compiler.
ar = ".."
Expand Down
2 changes: 1 addition & 1 deletion src/doc/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ bench = true
doc = true

# If the target is meant to be a compiler plugin, this field must be set to true
# for cargo to correctly compile it and make it available for all dependencies.
# for Cargo to correctly compile it and make it available for all dependencies.
plugin = false

# If set to false, `cargo test` will omit the --test flag to rustc, which stops
Expand Down
4 changes: 2 additions & 2 deletions src/doc/pkgid-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# Package ID Specifications

Subcommands of cargo frequently need to refer to a particular package within a
Subcommands of Cargo frequently need to refer to a particular package within a
dependency graph for various operations like updating, cleaning, building, etc.
To solve this problem, cargo supports Package ID Specifications. A specification
To solve this problem, Cargo supports Package ID Specifications. A specification
is a string which is used to uniquely refer to one package within a graph of
packages.

Expand Down

0 comments on commit bf9b784

Please sign in to comment.