auto merge of #13550 : brson/rust/man, r=alexcrichton

--no-analysis, --dep-info, -C relocation-model, remove --gen-crate-map

1 files changed, 5 insertions, 2 deletions

diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 4fc7239e63b..2d307d2c0a9 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -1103,7 +1103,8 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
          1 = line-tables only (for stacktraces and breakpoints),
          2 = full debug info with variable and type information (same as -g)", "LEVEL"),
   optflag("", "no-trans", "Run all passes except translation; no output"),
-  optflag("", "no-analysis", "Parse and expand the output, but run no analysis or produce output"),
+  optflag("", "no-analysis",
+          "Parse and expand the source, but run no analysis and produce no output"),
   optflag("O", "", "Equivalent to --opt-level=2"),
   optopt("o", "", "Write output to <filename>", "FILENAME"),
   optopt("", "opt-level", "Optimize with possible levels 0-3", "LEVEL"),
@@ -1116,7 +1117,9 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
               typed (crates expanded, with type annotations),
               or identified (fully parenthesized,
               AST nodes and blocks with IDs)", "TYPE"),
-  optflagopt("", "dep-info", "Output dependency info to <filename> after compiling", "FILENAME"),
+  optflagopt("", "dep-info",
+             "Output dependency info to <filename> after compiling, \
+              in a format suitable for use by Makefiles", "FILENAME"),
   optopt("", "sysroot", "Override the system root", "PATH"),
   optflag("", "test", "Build a test harness"),
   optopt("", "target", "Target triple cpu-manufacturer-kernel[-os]