Skip to content

Commit

Permalink
Auto merge of #10693 - alex-semenyuk:typos_cargo, r=ehuss
Browse files Browse the repository at this point in the history
Fixed small typos

Fixed small typos
  • Loading branch information
bors committed May 23, 2022
2 parents 83a7983 + d48a773 commit 9bc91ff
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
9 changes: 5 additions & 4 deletions src/doc/src/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### Is the plan to use GitHub as a package repository?

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

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

[1]: https://www.npmjs.org
[1]: https://www.npmjs.com
[2]: https://bundler.io
[3]: https://rubygems.org

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

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

### Why `Cargo.toml`?

Expand Down
6 changes: 3 additions & 3 deletions src/doc/src/reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Can be overridden with the `--target-dir` CLI option.
* Default: none
* Environment: `CARGO_BUILD_RUSTFLAGS` or `CARGO_ENCODED_RUSTFLAGS` or `RUSTFLAGS`

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

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

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

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

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

See [`build.rustflags`](#buildrustflags) for more details on the different
ways to specific extra flags.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/semver.md
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ explicit type arguments.
<a id="fn-generalize-compatible"></a>
### Minor: generalizing a function to use generics (supporting original type)

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

0 comments on commit 9bc91ff

Please sign in to comment.