Merge remote-tracking branch 'remotes/origin/master' into db-bump-version

Author: Diggsey

src/rustup-cli/common.rs

@@ -44,6 +44,7 @@ pub fn confirm_advanced() -> Result<Confirm> {
     println!("1) Proceed with installation (default)");
     println!("2) Customize installation");
     println!("3) Cancel installation");
+    print!(">");
 
     let _ = std::io::stdout().flush();
     let input = read_line()?;

src/rustup-cli/rustup_mode.rs

@@ -370,7 +370,12 @@ pub fn cli() -> App<'static, 'static> {
                         .long("std")
                         .help("Standard library API documentation"),
                 )
-                .group(ArgGroup::with_name("page").args(&["book", "std"])),
+                .arg(
+                    Arg::with_name("reference")
+                        .long("reference")
+                        .help("The Rust Reference"),
+                )
+                .group(ArgGroup::with_name("page").args(&["book", "std", "reference"])),
         );
 
     if cfg!(not(target_os = "windows")) {
@@ -918,6 +923,8 @@ fn doc(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
         "book/index.html"
     } else if m.is_present("std") {
         "std/index.html"
+    } else if m.is_present("reference") {
+        "reference/index.html"
     } else {
         "index.html"
     };

tests/cli-inst-interactive.rs

@@ -85,7 +85,7 @@ fn blank_lines_around_stderr_log_output_install() {
         assert!(out.stdout.contains(
             r"
 3) Cancel installation
-
+>
 
   stable installed - 1.1.0 (hash-s-2)
 
@@ -107,7 +107,7 @@ fn blank_lines_around_stderr_log_output_update() {
         assert!(out.stdout.contains(
             r"
 3) Cancel installation
-
+>
 
 
 Rust is installed now. Great!