diff options
| author | kennytm <kennytm@gmail.com> | 2018-12-01 01:06:10 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-12-01 02:03:58 +0800 |
| commit | 8641b8d1e254121623620778557b3422f2d460d9 (patch) | |
| tree | 965c12cd73d711509c060ee089d007e672b3d9df /src | |
| parent | fb2b2f5582b9eff3ee5d98ec5c9461847b6f0b2d (diff) | |
| parent | 934871aa794e87000b1255257a33b5d8b176aa40 (diff) | |
| download | rust-8641b8d1e254121623620778557b3422f2d460d9.tar.gz rust-8641b8d1e254121623620778557b3422f2d460d9.zip | |
Rollup merge of #56373 - steveklabnik:update-books, r=Mark-Simulacrum
Update books This pulls in @Gankro 's final nomicon changes, and adds the edition guide as a submodule. This is the final doc backport to beta for 1.31, as well.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/doc.rs | 1 | ||||
| m--------- | src/doc/edition-guide | 0 | ||||
| m--------- | src/doc/nomicon | 0 |
3 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index f9b19ffb10d..18a2b950e59 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 f8a4e96feb2e5a6ed1ef170ad40e3509a7755cb +Subproject b7eb4a087207af2405c0669fa577f8545b894c6 |