diff options
| author | bors <bors@rust-lang.org> | 2018-12-01 21:34:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-01 21:34:35 +0000 |
| commit | d2e3b533202c99fea647a4b616bf2d8a336d8def (patch) | |
| tree | f928daed1f46816f255d83ab8609b128c5710574 | |
| parent | eed5ba725352702ab3881b59ab46404b443783cb (diff) | |
| parent | ce5d4db9f918fd6f50772f1ff28990e9f7d583f7 (diff) | |
| download | rust-d2e3b533202c99fea647a4b616bf2d8a336d8def.tar.gz rust-d2e3b533202c99fea647a4b616bf2d8a336d8def.zip | |
Auto merge of #56380 - pietroalbini:backport-books, r=alexcrichton
[beta] Rollup backports Approved for backport: * #56373: Update books r? @ghost cc @Mark-Simulacrum @steveklabnik
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | src/bootstrap/doc.rs | 1 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/nomicon | 0 |
4 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 diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject fb3e2ac7bf52c127a06ea02fd7673d2617c4272 +Subproject aa1baade8a0753fbfc08dcd3d373cf5ed6f93f8 |