Auto merge of #56519 - steveklabnik:edition-guide, r=pietroalbini

update edition guide spiritual successor to #56457 not to be backported, being in nightly is enough. i'm testing this locally now but figure travis can test it in parallel
rust-lang · Dec 5, 2018 · d8046ed · d8046ed
2 parents b3af092 + 6b0ac49
commit d8046ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -442,7 +442,8 @@ impl<'a> Builder<'a> {
                 doc::RustdocBook,
                 doc::RustByExample,
                 doc::RustcBook,
-                doc::CargoBook
+                doc::CargoBook,
+                doc::EditionGuide,
             ),
             Kind::Dist => describe!(
                 dist::Docs,

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