Merge pull request #1763 from kinnison/kinnison/doc-self-update

Document `--no-self-update` properly

Author: kinnison

README.md

@@ -176,6 +176,10 @@ info: checking for self-updates
 info: downloading self-updates
 ```
 
+**Note**: `rustup` will automatically update itself at the end of any toolchain
+installation as well.  You can prevent this automatic behaviour by passing the
+`--no-self-update` argument when running `rustup update` or `rustup toolchain install`.
+
 ## Working with nightly Rust
 
 Rustup gives you easy access to the nightly compiler and its

src/cli/rustup_mode.rs

@@ -140,10 +140,9 @@ pub fn cli() -> App<'static, 'static> {
                 )
                 .arg(
                     Arg::with_name("no-self-update")
-                        .help("Don't perform self update when running the `rustup` command")
+                        .help("Don't perform self-update when running the `rustup install` command")
                         .long("no-self-update")
                         .takes_value(false)
-                        .hidden(true),
                 )
                 .arg(
                     Arg::with_name("force")
@@ -175,10 +174,9 @@ pub fn cli() -> App<'static, 'static> {
                 )
                 .arg(
                     Arg::with_name("no-self-update")
-                        .help("Don't perform self update when running the `rustup` command")
+                        .help("Don't perform self update when running the `rustup update` command")
                         .long("no-self-update")
                         .takes_value(false)
-                        .hidden(true),
                 )
                 .arg(
                     Arg::with_name("force")
@@ -217,10 +215,9 @@ pub fn cli() -> App<'static, 'static> {
                         )
                         .arg(
                             Arg::with_name("no-self-update")
-                                .help("Don't perform self update when running the `rustup` command")
+                                .help("Don't perform self update when running the `rustup toolchain install` command")
                                 .long("no-self-update")
                                 .takes_value(false)
-                                .hidden(true),
                         ),
                 )
                 .subcommand(