Skip to content

Commit 9bc91ff

Browse files
committed
Auto merge of #10693 - alex-semenyuk:typos_cargo, r=ehuss
Fixed small typos Fixed small typos
2 parents 83a7983 + d48a773 commit 9bc91ff

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/doc/src/faq.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### Is the plan to use GitHub as a package repository?
44

55
No. The plan for Cargo is to use [crates.io], like npm or Rubygems do with
6-
npmjs.org and rubygems.org.
6+
[npmjs.com][1] and [rubygems.org][3].
77

88
We plan to support git repositories as a source of packages forever,
99
because they can be used for early development and temporary patches,
@@ -23,8 +23,9 @@ central registry model as well as a Git-based model, and most packages
2323
are downloaded through the registry in those ecosystems, with an
2424
important minority of packages making use of git-based packages.
2525

26-
[1]: https://www.npmjs.org
26+
[1]: https://www.npmjs.com
2727
[2]: https://bundler.io
28+
[3]: https://rubygems.org
2829

2930
Some of the advantages that make a central registry popular in other
3031
languages include:
@@ -135,9 +136,9 @@ picture to decide what versions of dependencies should be used.
135136
with wildcard dependency constraints.**
136137

137138
While libraries _can_, strictly speaking, they should not. A version requirement
138-
of `*` says “This will work with every version ever,” which is never going
139+
of `*` says “This will work with every version ever”, which is never going
139140
to be true. Libraries should always specify the range that they do work with,
140-
even if it’s something as general as “every 1.x.y version.”
141+
even if it’s something as general as “every 1.x.y version”.
141142

142143
### Why `Cargo.toml`?
143144

src/doc/src/reference/config.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ Can be overridden with the `--target-dir` CLI option.
365365
* Default: none
366366
* Environment: `CARGO_BUILD_RUSTFLAGS` or `CARGO_ENCODED_RUSTFLAGS` or `RUSTFLAGS`
367367

368-
Extra command-line flags to pass to `rustc`. The value may be a array of
368+
Extra command-line flags to pass to `rustc`. The value may be an array of
369369
strings or a space-separated string.
370370

371371
There are four mutually exclusive sources of extra flags. They are checked in
@@ -402,7 +402,7 @@ appropriate profile setting.
402402
* Default: none
403403
* Environment: `CARGO_BUILD_RUSTDOCFLAGS` or `CARGO_ENCODED_RUSTDOCFLAGS` or `RUSTDOCFLAGS`
404404

405-
Extra command-line flags to pass to `rustdoc`. The value may be a array of
405+
Extra command-line flags to pass to `rustdoc`. The value may be an array of
406406
strings or a space-separated string.
407407

408408
There are three mutually exclusive sources of extra flags. They are checked in
@@ -974,7 +974,7 @@ the `<triple>` will take precedence. It is an error if more than one
974974
* Environment: `CARGO_TARGET_<triple>_RUSTFLAGS`
975975

976976
Passes a set of custom flags to the compiler for this `<triple>`. The value
977-
may be a array of strings or a space-separated string.
977+
may be an array of strings or a space-separated string.
978978

979979
See [`build.rustflags`](#buildrustflags) for more details on the different
980980
ways to specific extra flags.

src/doc/src/reference/semver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ explicit type arguments.
955955
<a id="fn-generalize-compatible"></a>
956956
### Minor: generalizing a function to use generics (supporting original type)
957957

958-
The type of an parameter to a function, or its return value, can be
958+
The type of a parameter to a function, or its return value, can be
959959
*generalized* to use generics, including by introducing a new type parameter,
960960
as long as it can be instantiated to the original type. For example, the
961961
following changes are allowed:

0 commit comments

Comments
 (0)