Skip to content

Commit

Permalink
Auto merge of #8738 - ehuss:rustup-links, r=alexcrichton
Browse files Browse the repository at this point in the history
Update links to rustup docs.

The rustup docs have moved, so update some of the documentation links.
  • Loading branch information
bors committed Sep 27, 2020
2 parents 1ffdfb7 + fac70ee commit fd0628b
Show file tree
Hide file tree
Showing 93 changed files with 131 additions and 126 deletions.
4 changes: 3 additions & 1 deletion src/doc/man/cargo.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ environment variable.

`$CARGO_HOME/bin/`\
    Binaries installed by {{man "cargo-install" 1}} will be located here. If using
rustup, executables distributed with Rust are also located here.
[rustup], executables distributed with Rust are also located here.

`$CARGO_HOME/config.toml`\
    The global configuration file. See [the reference](../reference/config.html)
Expand All @@ -198,6 +198,8 @@ downloaded dependencies.
Please note that the internal structure of the `$CARGO_HOME` directory is not
stable yet and may be subject to change.

[rustup]: https://rust-lang.github.io/rustup/

## EXAMPLES

1. Build a local package and all of its dependencies:
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-bench.txt
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-check.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-clean.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-fetch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-fix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-generate-lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-init.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-locate-project.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-login.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-metadata.txt
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-new.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-owner.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-package.txt
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-pkgid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-publish.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-run.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-rustc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-rustdoc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-search.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-uninstall.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-update.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-vendor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-verify-project.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
4 changes: 2 additions & 2 deletions src/doc/man/generated_txt/cargo-yank.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand Down
7 changes: 4 additions & 3 deletions src/doc/man/generated_txt/cargo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ OPTIONS
If Cargo has been installed with rustup, and the first argument to
cargo begins with +, it will be interpreted as a rustup toolchain
name (such as +stable or +nightly). See the rustup documentation
<https://github.com/rust-lang/rustup/> for more information about
how toolchain overrides work.
<https://rust-lang.github.io/rustup/overrides.html> for more
information about how toolchain overrides work.

-h, --help
Prints help information.
Expand All @@ -211,7 +211,8 @@ FILES

$CARGO_HOME/bin/
    Binaries installed by cargo-install(1) will be located here. If
using rustup, executables distributed with Rust are also located here.
using rustup <https://rust-lang.github.io/rustup/>, executables
distributed with Rust are also located here.

$CARGO_HOME/config.toml
    The global configuration file. See the reference
Expand Down
2 changes: 1 addition & 1 deletion src/doc/man/includes/section-options-common.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
If Cargo has been installed with rustup, and the first argument to `cargo`
begins with `+`, it will be interpreted as a rustup toolchain name (such
as `+stable` or `+nightly`).
See the [rustup documentation](https://github.com/rust-lang/rustup/)
See the [rustup documentation](https://rust-lang.github.io/rustup/overrides.html)
for more information about how toolchain overrides work.
{{/option}}

Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-bench.md
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ offline.</p>
<dd class="option-desc">If Cargo has been installed with rustup, and the first argument to <code>cargo</code>
begins with <code>+</code>, it will be interpreted as a rustup toolchain name (such
as <code>+stable</code> or <code>+nightly</code>).
See the <a href="https://github.com/rust-lang/rustup/">rustup documentation</a>
See the <a href="https://rust-lang.github.io/rustup/overrides.html">rustup documentation</a>
for more information about how toolchain overrides work.</dd>


Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ offline.</p>
<dd class="option-desc">If Cargo has been installed with rustup, and the first argument to <code>cargo</code>
begins with <code>+</code>, it will be interpreted as a rustup toolchain name (such
as <code>+stable</code> or <code>+nightly</code>).
See the <a href="https://github.com/rust-lang/rustup/">rustup documentation</a>
See the <a href="https://rust-lang.github.io/rustup/overrides.html">rustup documentation</a>
for more information about how toolchain overrides work.</dd>


Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-check.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ offline.</p>
<dd class="option-desc">If Cargo has been installed with rustup, and the first argument to <code>cargo</code>
begins with <code>+</code>, it will be interpreted as a rustup toolchain name (such
as <code>+stable</code> or <code>+nightly</code>).
See the <a href="https://github.com/rust-lang/rustup/">rustup documentation</a>
See the <a href="https://rust-lang.github.io/rustup/overrides.html">rustup documentation</a>
for more information about how toolchain overrides work.</dd>


Expand Down
Loading

0 comments on commit fd0628b

Please sign in to comment.