Some editorial changes to the installation chapters.

Author: ehuss

doc/src/installation/index.md

@@ -35,17 +35,18 @@ and that `CARGO_HOME/bin` is in the `$PATH` environment variable when using
 the toolchain.
 
 [Environment Variables]: ../environment-variables.md
-[cargo]: https://github.com/rust-lang/cargo
+[cargo]: https://doc.rust-lang.org/cargo/
 
 ## Installing nightly
 
-When `rustup-init` installs the initial toolchain it _forces_ the installation
-and so will install the `nightly` channel regardless of whether it might be
-missing components that you want.  For example, if you want to make a fresh
+If you specify the [nightly channel] when installing `rustup`, the
+`rustup-init` script will do a "forced" installation by default. A "forced"
+installation means it will install the nightly channel regardless of whether
+it might be missing [components] that you want. If you want to install rustup
+with the nightly channel, and ensure it has the components that you want, you
+will need to do this in two phases. For example, if you want to make a fresh
 installation of `rustup` and then install `nightly` along with `clippy` or
-`miri` you will need to do this in two phases.
-
-Firstly install `rustup` by means of:
+`miri`, first install `rustup` without a toolchain:
 
 ```console
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y
@@ -61,6 +62,9 @@ rustup toolchain install nightly --allow-downgrade --profile minimal --component
 This can be used to great effect in CI, to get you a toolchain rapidly which
 meets your criteria.
 
+[nightly channel]: ../concepts/channels.md
+[components]: ../concepts/components.md
+
 ## Enable tab completion for Bash, Fish, Zsh, or PowerShell
 
 `rustup` now supports generating completion scripts for Bash, Fish, Zsh, and

doc/src/installation/other.md

@@ -1,7 +1,7 @@
 # Other installation methods
 
-The primary installation method, as described at https://rustup.rs, differs by
-platform:
+The primary installation method, as described at <https://rustup.rs>, differs
+by platform:
 
 * On Windows, download and run the [rustup-init.exe built for
   `i686-pc-windows-gnu` target][setup]. In general, this is the build of
@@ -72,7 +72,8 @@ choice:
 You can fetch an older version from
 `https://static.rust-lang.org/rustup/archive/{rustup-version}/{target-triple}/rustup-init[.exe]`
 
-To install from source just run `cargo run --release`. Note that currently
-`rustup` only builds on nightly Rust, and that after installation the `rustup`
-toolchains will supersede any pre-existing toolchains by prepending
-`~/.cargo/bin` to the `PATH` environment variable.
+To install `rustup` from source, check out the git repository from
+<https://github.com/rust-lang/rustup> and run `cargo run --release`. Note that
+currently `rustup` only builds on nightly Rust, and that after installation
+the `rustup` toolchains will supersede any pre-existing toolchains by
+prepending `~/.cargo/bin` to the `PATH` environment variable.

doc/src/installation/package-managers.md

@@ -3,7 +3,7 @@
 Several Linux distributions package Rust, and you may wish to use the packaged
 toolchain, such as for distribution package development. You may also wish to
 use a `rustup`-managed toolchain such as nightly or beta. Normally, `rustup`
-will complain that you already have Rust installed in /usr and refuse to
+will complain that you already have Rust installed in `/usr` and refuse to
 install. However, you can install Rust via `rustup` and have it coexist with
 your distribution's packaged Rust.
 
@@ -17,13 +17,16 @@ system toolchain, run:
 rustup toolchain link system /usr
 ```
 
-You can then use +system as a `rustup` toolchain, just like +nightly; for
-instance, you can run cargo +system build to build with the system toolchain,
-or cargo +nightly build to build with nightly.
+You can then use "system" as a `rustup` toolchain, just like "nightly".
+For example, using the [toolchain override shorthand], you can run `cargo +system build`
+to build with the system toolchain, or `cargo +nightly build` to build with nightly.
 
-If you do distribution Rust development, you should likely make +system your
-default toolchain:
+If you do distribution Rust development, you should likely make "system" your
+[default toolchain]:
 
 ```console
 rustup default system
 ```
+
+[toolchain override shorthand]: ../overrides.md#toolchain-override-shorthand
+[default toolchain]: ../overrides.md#default-toolchain

doc/src/installation/windows.md

@@ -10,10 +10,10 @@ Visual Studio use the MSVC build of Rust; for interop with GNU software built
 using the [MinGW/MSYS2 toolchain] use the GNU build.
 
 When targeting the MSVC ABI, Rust additionally requires an [installation of
-Visual Studio 2013 (or later) or the Visual C++ Build Tools 2019][vs] so rustc
-can use its linker. For Visual Studio, make sure to check the "C++ tools" and
-"Windows 10 SDK" option. No additional software installation is necessary for
-basic use of the GNU build.
+Visual Studio 2013 (or later) or the Visual C++ Build Tools 2019][vs] so
+`rustc` can use its linker. For Visual Studio, make sure to check the "C++
+tools" and "Windows 10 SDK" option. No additional software installation is
+necessary for basic use of the GNU build.
 
 By default `rustup` on Windows configures Rust to target the MSVC ABI, that is
 a target triple of either `i686-pc-windows-msvc` or `x86_64-pc-windows-msvc`
@@ -37,8 +37,6 @@ Or to choose the 64 bit GNU toolchain:
 $ rustup set default-host x86_64-pc-windows-gnu
 ```
 
-[toolchain specification]: #toolchain-specification
-
 Since the MSVC ABI provides the best interoperation with other Windows
 software it is recommended for most purposes. The GNU toolchain is always
 available, even if you don't use it by default. Just install it with `rustup
@@ -58,7 +56,11 @@ $ rustup target add i686-pc-windows-msvc
 $ rustup target add i686-pc-windows-gnu
 ```
 
+See the [Cross-compilation] chapter for more details on specifying different
+targets with the same compiler.
+
 [ABIs]: https://en.wikipedia.org/wiki/Application_binary_interface
+[cross-compilation]: ../cross-compilation.md
 [GCC toolchain]: https://gcc.gnu.org/
 [MinGW/MSYS2 toolchain]: https://msys2.github.io/
 [msvc-toolchain]: https://www.rust-lang.org/tools/install?platform_override=win