about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2018-11-30 09:36:49 -0500
committerPietro Albini <pietro@pietroalbini.org>2018-11-30 17:49:37 +0100
commitc3c2c811c167a1d0b50851e94cd1d2aca12f2abe (patch)
tree92b6b2a2b609b98a95037ab512e01e0cb9b81338
parent864b775276dd4690bb3703160122e564ea857ea5 (diff)
downloadrust-c3c2c811c167a1d0b50851e94cd1d2aca12f2abe.tar.gz
rust-c3c2c811c167a1d0b50851e94cd1d2aca12f2abe.zip
Add the edition guide to doc.rust-lang.org
-rw-r--r--.gitmodules4
-rw-r--r--src/bootstrap/doc.rs1
m---------src/doc/edition-guide0
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 038237aa179..8287873081d 100644
--- 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
-  
\ No newline at end of file
+[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
index cb3b61792bf..85767936fcf 100644
--- 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
new file mode 160000
+Subproject ad895867b675199a7f597ce7045a56875a7e516