--merge=auto -> --merge=read-write

Author: EtomicBomb

src/librustdoc/config.rs

@@ -948,11 +948,11 @@ struct ShouldMerge {
 /// reports an error.
 fn parse_merge(matches: &getopts::Matches) -> Result<ShouldMerge, &'static str> {
     match matches.opt_str("merge").as_deref() {
-        // default = auto
+        // default = read-write
         None => Ok(ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }),
-        Some("auto") => Ok(ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }),
+        Some("read-write") => Ok(ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }),
         Some("none") => Ok(ShouldMerge { read_rendered_cci: false, write_rendered_cci: false }),
         Some("write-only") => Ok(ShouldMerge { read_rendered_cci: false, write_rendered_cci: true }),
-        Some(_) => Err("argument to --merge must be `auto`, `none`, or `write-only`"),
+        Some(_) => Err("argument to --merge must be `read-write`, `none`, or `write-only`"),
     }
 }

src/librustdoc/lib.rs

@@ -608,10 +608,10 @@ fn opts() -> Vec<RustcOptGroup> {
                 "",
                 "merge",
                 "Controls how rustdoc handles files from previously documented crates in the doc root.
-                          auto = append (default)
+                          read-write = append to the existing files (default)
                           none = do not write new versions of these files
                           write-only = overwrite these files without reading previous content",
-                "auto|none|write-only",
+                "read-write|none|write-only",
             )
         }),
         unstable("include-info-json", |o| {