From 934871aa794e87000b1255257a33b5d8b176aa40 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Fri, 30 Nov 2018 09:36:49 -0500 Subject: [PATCH] Add the edition guide to doc.rust-lang.org --- .gitmodules | 3 +++ src/bootstrap/doc.rs | 1 + src/doc/edition-guide | 1 + 3 files changed, 5 insertions(+) create mode 160000 src/doc/edition-guide diff --git a/.gitmodules b/.gitmodules index 6b2714edd4d12..4a136cff1cdf2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -65,3 +65,6 @@ [submodule "src/doc/rustc-guide"] path = src/doc/rustc-guide url = https://github.com/rust-lang/rustc-guide.git +[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 f9b19ffb10d69..18a2b950e5966 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 index 0000000000000..ad895867b6751 --- /dev/null +++ b/src/doc/edition-guide @@ -0,0 +1 @@ +Subproject commit ad895867b675199a7f597ce7045a56875a7e516a