Auto merge of #40368 - arielb1:rollup, r=arielb1

Rollup of 20 pull requests - Successful merges: #40154, #40222, #40226, #40237, #40254, #40258, #40265, #40268, #40279, #40283, #40292, #40293, #40296, #40316, #40321, #40325, #40326, #40327, #40333, #40335 - Failed merges:
rust-lang · Mar 9, 2017 · 3087a1f · 3087a1f
2 parents 5c9208f + f2886e8
commit 3087a1f
Show file tree

Hide file tree

Showing 83 changed files with 435 additions and 5,780 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -18,6 +18,9 @@
 [submodule "src/liblibc"]
 	path = src/liblibc
 	url = https://github.com/rust-lang/libc.git
+[submodule "src/doc/nomicon"]
+	path = src/doc/nomicon
+	url = https://github.com/rust-lang-nursery/nomicon
 [submodule "src/tools/cargo"]
 	path = src/tools/cargo
 	url = https://github.com/rust-lang/cargo

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -406,5 +406,5 @@ are:
 [rr]: https://doc.rust-lang.org/book/README.html
 [tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
 [ro]: http://www.rustaceans.org/
-[rctd]: ./COMPILER_TESTS.md
+[rctd]: ./src/test/COMPILER_TESTS.md
 [cheatsheet]: https://buildbot.rust-lang.org/homu/
diff --git a/README.md b/README.md
@@ -149,7 +149,7 @@ $ ./configure
 $ make && sudo make install
 ```
 
-When using the configure script, the generated config.mk` file may override the
+When using the configure script, the generated `config.mk` file may override the
 `config.toml` file. To go back to the `config.toml` file, delete the generated
 `config.mk` file.
 

diff --git a/src/doc/index.md b/src/doc/index.md
@@ -28,6 +28,7 @@ Rust provides a number of book-length sets of documentation, collectively
 nicknamed 'The Rust Bookshelf.'
 
 * [The Rust Programming Language][book] teaches you how to program in Rust.
+* [The Unstable Book][unstable-book] has documentation for unstable features.
 * [The Rustonomicon][nomicon] is your guidebook to the dark arts of unsafe Rust.
 * [The Reference][ref] is not a formal spec, but is more detailed and comprehensive than the book.
 
@@ -44,4 +45,5 @@ landed before then. That work is being tracked [here][38643].
 [err]: error-index.html
 [book]: book/index.html
 [nomicon]: nomicon/index.html
+[unstable-book]: unstable-book/index.html
 
diff --git a/src/doc/nomicon b/src/doc/nomicon
diff --git a/src/doc/nomicon/src/README.md b/src/doc/nomicon/src/README.md
diff --git a/src/doc/nomicon/src/SUMMARY.md b/src/doc/nomicon/src/SUMMARY.md
diff --git a/src/doc/nomicon/src/arc-and-mutex.md b/src/doc/nomicon/src/arc-and-mutex.md