Auto merge of rust-lang#56380 - pietroalbini:backport-books, r=alexcr…

…ichton [beta] Rollup backports Approved for backport: * rust-lang#56373: Update books r? @ghost cc @Mark-Simulacrum @steveklabnik
pietroalbini · Dec 1, 2018 · d2e3b53 · d2e3b53
2 parents eed5ba7 + ce5d4db
commit d2e3b53
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -64,4 +64,6 @@
 	path = src/tools/clang
 	url = https://github.com/rust-lang-nursery/clang.git
 	branch = rust-release-80-v1
-
+[submodule "src/doc/edition-guide"]
+	path = src/doc/edition-guide
+	url = https://github.com/rust-lang-nursery/edition-guide
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -70,6 +70,7 @@ macro_rules! book {
 book!(
     Nomicon, "src/doc/nomicon", "nomicon";
     Reference, "src/doc/reference", "reference";
+    EditionGuide, "src/doc/edition-guide", "edition-guide";
     RustdocBook, "src/doc/rustdoc", "rustdoc";
     RustcBook, "src/doc/rustc", "rustc";
     RustByExample, "src/doc/rust-by-example", "rust-by-example";

diff --git a/src/doc/edition-guide b/src/doc/edition-guide
diff --git a/src/doc/nomicon b/src/doc/nomicon