diff options
| author | bors <bors@rust-lang.org> | 2017-09-12 12:41:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-12 12:41:23 +0000 |
| commit | a7b7dce02da1b10f6da79b2f2e93a73314faf497 (patch) | |
| tree | aa4df96baeabd828680fb5b7c8f4d8a97a70e513 | |
| parent | 817e1b81e230d599585f860cdcad96c5ed83b93e (diff) | |
| parent | d587558269855870229ae995cc88bd5a0ddcb87b (diff) | |
| download | rust-a7b7dce02da1b10f6da79b2f2e93a73314faf497.tar.gz rust-a7b7dce02da1b10f6da79b2f2e93a73314faf497.zip | |
Auto merge of #44413 - est31:move_man, r=nikomatsakis
Move the man directory to a subdirectory There is no reason it should be in the top directory.
| -rw-r--r-- | src/bootstrap/dist.rs | 3 | ||||
| -rw-r--r-- | src/doc/man/rustc.1 (renamed from man/rustc.1) | 0 | ||||
| -rw-r--r-- | src/doc/man/rustdoc.1 (renamed from man/rustdoc.1) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 8e11e1b0580..9180c7d165a 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -432,7 +432,7 @@ impl Step for Rustc { // Man pages t!(fs::create_dir_all(image.join("share/man/man1"))); - cp_r(&build.src.join("man"), &image.join("share/man/man1")); + cp_r(&build.src.join("src/doc/man"), &image.join("share/man/man1")); // Debugger scripts builder.ensure(DebuggerScripts { @@ -834,7 +834,6 @@ impl Step for PlainSourceTarball { "config.toml.example", ]; let src_dirs = [ - "man", "src", ]; diff --git a/man/rustc.1 b/src/doc/man/rustc.1 index 6c80f11fa72..6c80f11fa72 100644 --- a/man/rustc.1 +++ b/src/doc/man/rustc.1 diff --git a/man/rustdoc.1 b/src/doc/man/rustdoc.1 index d34ab613549..d34ab613549 100644 --- a/man/rustdoc.1 +++ b/src/doc/man/rustdoc.1 |