72 files changed, 4 insertions, 4 deletions
diff --git a/mk/docs.mk b/mk/docs.mk
index b0872c88c14..f76368e3d0b 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -65,7 +65,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
 
 D := $(S)src/doc
 
-DOC_TARGETS := trpl nomicon style error-index
+DOC_TARGETS := book nomicon style error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -194,12 +194,12 @@ docs: $(DOC_TARGETS)
 doc: docs
 compiler-docs: $(COMPILER_DOC_TARGETS)
 
-trpl: doc/book/index.html
+book: doc/book/index.html
 
-doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
+doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/book/*.md) | doc/
 	@$(call E, rustbook: $@)
 	$(Q)rm -rf doc/book
-	$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
+	$(Q)$(RUSTBOOK) build $(S)src/doc/book doc/book
 
 nomicon: doc/nomicon/index.html
 
diff --git a/src/doc/trpl/README.md b/src/doc/book/README.md
index 7acb7f835b8..7acb7f835b8 100644
--- a/src/doc/trpl/README.md
+++ b/src/doc/book/README.md
diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/book/SUMMARY.md
index 704bcf1587b..704bcf1587b 100644
--- a/src/doc/trpl/SUMMARY.md
+++ b/src/doc/book/SUMMARY.md
diff --git a/src/doc/trpl/advanced-linking.md b/src/doc/book/advanced-linking.md
index 9ef6d5c2bff..9ef6d5c2bff 100644
--- a/src/doc/trpl/advanced-linking.md
+++ b/src/doc/book/advanced-linking.md
diff --git a/src/doc/trpl/associated-constants.md b/src/doc/book/associated-constants.md
index 81f7ea104e4..81f7ea104e4 100644
--- a/src/doc/trpl/associated-constants.md
+++ b/src/doc/book/associated-constants.md
diff --git a/src/doc/trpl/associated-types.md b/src/doc/book/associated-types.md
index fe4f27b9d95..fe4f27b9d95 100644
--- a/src/doc/trpl/associated-types.md
+++ b/src/doc/book/associated-types.md
diff --git a/src/doc/trpl/attributes.md b/src/doc/book/attributes.md
index 63496471b5a..63496471b5a 100644
--- a/src/doc/trpl/attributes.md
+++ b/src/doc/book/attributes.md
diff --git a/src/doc/trpl/benchmark-tests.md b/src/doc/book/benchmark-tests.md
index 797ec94774d..797ec94774d 100644
--- a/src/doc/trpl/benchmark-tests.md
+++ b/src/doc/book/benchmark-tests.md
diff --git a/src/doc/trpl/bibliography.md b/src/doc/book/bibliography.md
index ba02053b6b8..ba02053b6b8 100644
--- a/src/doc/trpl/bibliography.md
+++ b/src/doc/book/bibliography.md
diff --git a/src/doc/trpl/borrow-and-asref.md b/src/doc/book/borrow-and-asref.md
index 1cfeb2620bd..1cfeb2620bd 100644
--- a/src/doc/trpl/borrow-and-asref.md
+++ b/src/doc/book/borrow-and-asref.md
diff --git a/src/doc/trpl/box-syntax-and-patterns.md b/src/doc/book/box-syntax-and-patterns.md
index 8d83b64d683..8d83b64d683 100644
--- a/src/doc/trpl/box-syntax-and-patterns.md
+++ b/src/doc/book/box-syntax-and-patterns.md
diff --git a/src/doc/trpl/casting-between-types.md b/src/doc/book/casting-between-types.md
index 148c55e4b97..148c55e4b97 100644
--- a/src/doc/trpl/casting-between-types.md
+++ b/src/doc/book/casting-between-types.md
diff --git a/src/doc/trpl/choosing-your-guarantees.md b/src/doc/book/choosing-your-guarantees.md
index d9e92de8d9a..d9e92de8d9a 100644
--- a/src/doc/trpl/choosing-your-guarantees.md
+++ b/src/doc/book/choosing-your-guarantees.md
diff --git a/src/doc/trpl/closures.md b/src/doc/book/closures.md
index 7d4452a4c84..7d4452a4c84 100644
--- a/src/doc/trpl/closures.md
+++ b/src/doc/book/closures.md
diff --git a/src/doc/trpl/comments.md b/src/doc/book/comments.md
index e7eb48dc42c..e7eb48dc42c 100644
--- a/src/doc/trpl/comments.md
+++ b/src/doc/book/comments.md
diff --git a/src/doc/trpl/compiler-plugins.md b/src/doc/book/compiler-plugins.md
index 42dfaa1a809..42dfaa1a809 100644
--- a/src/doc/trpl/compiler-plugins.md
+++ b/src/doc/book/compiler-plugins.md
diff --git a/src/doc/trpl/concurrency.md b/src/doc/book/concurrency.md
index cc6cfc2f4a0..cc6cfc2f4a0 100644
--- a/src/doc/trpl/concurrency.md
+++ b/src/doc/book/concurrency.md
diff --git a/src/doc/trpl/conditional-compilation.md b/src/doc/book/conditional-compilation.md
index a6ff75db89b..a6ff75db89b 100644
--- a/src/doc/trpl/conditional-compilation.md
+++ b/src/doc/book/conditional-compilation.md
diff --git a/src/doc/trpl/const-and-static.md b/src/doc/book/const-and-static.md
index 7d555b52a98..7d555b52a98 100644
--- a/src/doc/trpl/const-and-static.md
+++ b/src/doc/book/const-and-static.md
diff --git a/src/doc/trpl/crates-and-modules.md b/src/doc/book/crates-and-modules.md
index 4a4648c7b56..4a4648c7b56 100644
--- a/src/doc/trpl/crates-and-modules.md
+++ b/src/doc/book/crates-and-modules.md
diff --git a/src/doc/trpl/custom-allocators.md b/src/doc/book/custom-allocators.md
index 6b19abc728c..6b19abc728c 100644
--- a/src/doc/trpl/custom-allocators.md
+++ b/src/doc/book/custom-allocators.md
diff --git a/src/doc/trpl/deref-coercions.md b/src/doc/book/deref-coercions.md
index beb65c4ce35..beb65c4ce35 100644
--- a/src/doc/trpl/deref-coercions.md
+++ b/src/doc/book/deref-coercions.md
diff --git a/src/doc/trpl/dining-philosophers.md b/src/doc/book/dining-philosophers.md
index 50d758c3a10..50d758c3a10 100644
--- a/src/doc/trpl/dining-philosophers.md
+++ b/src/doc/book/dining-philosophers.md
diff --git a/src/doc/trpl/documentation.md b/src/doc/book/documentation.md
index 80aed0d1ca7..80aed0d1ca7 100644
--- a/src/doc/trpl/documentation.md
+++ b/src/doc/book/documentation.md
diff --git a/src/doc/trpl/drop.md b/src/doc/book/drop.md
index 8bc25ef90d3..8bc25ef90d3 100644
--- a/src/doc/trpl/drop.md
+++ b/src/doc/book/drop.md
diff --git a/src/doc/trpl/effective-rust.md b/src/doc/book/effective-rust.md
index 582ed3b7e65..582ed3b7e65 100644
--- a/src/doc/trpl/effective-rust.md
+++ b/src/doc/book/effective-rust.md
diff --git a/src/doc/trpl/enums.md b/src/doc/book/enums.md
index 8ad4eeedd18..8ad4eeedd18 100644
--- a/src/doc/trpl/enums.md
+++ b/src/doc/book/enums.md
diff --git a/src/doc/trpl/error-handling.md b/src/doc/book/error-handling.md
index 52a4e7324ee..52a4e7324ee 100644
--- a/src/doc/trpl/error-handling.md
+++ b/src/doc/book/error-handling.md
diff --git a/src/doc/trpl/ffi.md b/src/doc/book/ffi.md
index d949bf33b6e..d949bf33b6e 100644
--- a/src/doc/trpl/ffi.md
+++ b/src/doc/book/ffi.md
diff --git a/src/doc/trpl/functions.md b/src/doc/book/functions.md
index 84cea5dabc3..84cea5dabc3 100644
--- a/src/doc/trpl/functions.md
+++ b/src/doc/book/functions.md
diff --git a/src/doc/trpl/generics.md b/src/doc/book/generics.md
index 347c1f5757c..347c1f5757c 100644
--- a/src/doc/trpl/generics.md
+++ b/src/doc/book/generics.md
diff --git a/src/doc/trpl/getting-started.md b/src/doc/book/getting-started.md
index 5b1040dd05e..5b1040dd05e 100644
--- a/src/doc/trpl/getting-started.md
+++ b/src/doc/book/getting-started.md
diff --git a/src/doc/trpl/glossary.md b/src/doc/book/glossary.md
index 0956580ade0..0956580ade0 100644
--- a/src/doc/trpl/glossary.md
+++ b/src/doc/book/glossary.md
diff --git a/src/doc/trpl/guessing-game.md b/src/doc/book/guessing-game.md
index 6a513fb2c59..6a513fb2c59 100644
--- a/src/doc/trpl/guessing-game.md
+++ b/src/doc/book/guessing-game.md
diff --git a/src/doc/trpl/if-let.md b/src/doc/book/if-let.md
index faa922acb3d..faa922acb3d 100644
--- a/src/doc/trpl/if-let.md
+++ b/src/doc/book/if-let.md
diff --git a/src/doc/trpl/if.md b/src/doc/book/if.md
index a532dabf8d1..a532dabf8d1 100644
--- a/src/doc/trpl/if.md
+++ b/src/doc/book/if.md
diff --git a/src/doc/trpl/inline-assembly.md b/src/doc/book/inline-assembly.md
index 7659c4ff88d..7659c4ff88d 100644
--- a/src/doc/trpl/inline-assembly.md
+++ b/src/doc/book/inline-assembly.md
diff --git a/src/doc/trpl/intrinsics.md b/src/doc/book/intrinsics.md
index d1d836fe188..d1d836fe188 100644
--- a/src/doc/trpl/intrinsics.md
+++ b/src/doc/book/intrinsics.md
diff --git a/src/doc/trpl/iterators.md b/src/doc/book/iterators.md
index c444f9f2fe5..c444f9f2fe5 100644
--- a/src/doc/trpl/iterators.md
+++ b/src/doc/book/iterators.md
diff --git a/src/doc/trpl/lang-items.md b/src/doc/book/lang-items.md
index 76b9f82827b..76b9f82827b 100644
--- a/src/doc/trpl/lang-items.md
+++ b/src/doc/book/lang-items.md
diff --git a/src/doc/trpl/learn-rust.md b/src/doc/book/learn-rust.md
index 1a02bc95e9d..1a02bc95e9d 100644
--- a/src/doc/trpl/learn-rust.md
+++ b/src/doc/book/learn-rust.md
diff --git a/src/doc/trpl/lifetimes.md b/src/doc/book/lifetimes.md
index 68bbd0c9899..68bbd0c9899 100644
--- a/src/doc/trpl/lifetimes.md
+++ b/src/doc/book/lifetimes.md
diff --git a/src/doc/trpl/loops.md b/src/doc/book/loops.md
index 72e803d04f8..72e803d04f8 100644
--- a/src/doc/trpl/loops.md
+++ b/src/doc/book/loops.md
diff --git a/src/doc/trpl/macros.md b/src/doc/book/macros.md
index f7f27858cd2..f7f27858cd2 100644
--- a/src/doc/trpl/macros.md
+++ b/src/doc/book/macros.md
diff --git a/src/doc/trpl/match.md b/src/doc/book/match.md
index 113e218883b..113e218883b 100644
--- a/src/doc/trpl/match.md
+++ b/src/doc/book/match.md
diff --git a/src/doc/trpl/method-syntax.md b/src/doc/book/method-syntax.md
index 41c134b29f3..41c134b29f3 100644
--- a/src/doc/trpl/method-syntax.md
+++ b/src/doc/book/method-syntax.md
diff --git a/src/doc/trpl/mutability.md b/src/doc/book/mutability.md
index 71acb551e6e..71acb551e6e 100644
--- a/src/doc/trpl/mutability.md
+++ b/src/doc/book/mutability.md
diff --git a/src/doc/trpl/nightly-rust.md b/src/doc/book/nightly-rust.md
index 0578fbf8bdb..0578fbf8bdb 100644
--- a/src/doc/trpl/nightly-rust.md
+++ b/src/doc/book/nightly-rust.md
diff --git a/src/doc/trpl/no-stdlib.md b/src/doc/book/no-stdlib.md
index 0040878fb2f..0040878fb2f 100644
--- a/src/doc/trpl/no-stdlib.md
+++ b/src/doc/book/no-stdlib.md
diff --git a/src/doc/trpl/operators-and-overloading.md b/src/doc/book/operators-and-overloading.md
index e53664eeb55..e53664eeb55 100644
--- a/src/doc/trpl/operators-and-overloading.md
+++ b/src/doc/book/operators-and-overloading.md
diff --git a/src/doc/trpl/ownership.md b/src/doc/book/ownership.md
index 17b263ef00a..17b263ef00a 100644
--- a/src/doc/trpl/ownership.md
+++ b/src/doc/book/ownership.md
diff --git a/src/doc/trpl/patterns.md b/src/doc/book/patterns.md
index 8f4a7a43955..8f4a7a43955 100644
--- a/src/doc/trpl/patterns.md
+++ b/src/doc/book/patterns.md
diff --git a/src/doc/trpl/primitive-types.md b/src/doc/book/primitive-types.md
index a8c7a7d4157..a8c7a7d4157 100644
--- a/src/doc/trpl/primitive-types.md
+++ b/src/doc/book/primitive-types.md
diff --git a/src/doc/trpl/raw-pointers.md b/src/doc/book/raw-pointers.md
index 679f5489ea8..679f5489ea8 100644
--- a/src/doc/trpl/raw-pointers.md
+++ b/src/doc/book/raw-pointers.md
diff --git a/src/doc/trpl/references-and-borrowing.md b/src/doc/book/references-and-borrowing.md
index d8758e0c695..d8758e0c695 100644
--- a/src/doc/trpl/references-and-borrowing.md
+++ b/src/doc/book/references-and-borrowing.md
diff --git a/src/doc/trpl/release-channels.md b/src/doc/book/release-channels.md
index 1e203c6553e..1e203c6553e 100644
--- a/src/doc/trpl/release-channels.md
+++ b/src/doc/book/release-channels.md
diff --git a/src/doc/trpl/rust-inside-other-languages.md b/src/doc/book/rust-inside-other-languages.md
index 61627c0b5a2..61627c0b5a2 100644
--- a/src/doc/trpl/rust-inside-other-languages.md
+++ b/src/doc/book/rust-inside-other-languages.md
diff --git a/src/doc/trpl/slice-patterns.md b/src/doc/book/slice-patterns.md
index de165b70fc4..de165b70fc4 100644
--- a/src/doc/trpl/slice-patterns.md
+++ b/src/doc/book/slice-patterns.md
diff --git a/src/doc/trpl/strings.md b/src/doc/book/strings.md
index 42a0acd21a2..42a0acd21a2 100644
--- a/src/doc/trpl/strings.md
+++ b/src/doc/book/strings.md
diff --git a/src/doc/trpl/structs.md b/src/doc/book/structs.md
index b51ad8e087d..b51ad8e087d 100644
--- a/src/doc/trpl/structs.md
+++ b/src/doc/book/structs.md
diff --git a/src/doc/trpl/syntax-and-semantics.md b/src/doc/book/syntax-and-semantics.md
index cce985c9e48..cce985c9e48 100644
--- a/src/doc/trpl/syntax-and-semantics.md
+++ b/src/doc/book/syntax-and-semantics.md
diff --git a/src/doc/trpl/syntax-index.md b/src/doc/book/syntax-index.md
index d0b46ed3719..d0b46ed3719 100644
--- a/src/doc/trpl/syntax-index.md
+++ b/src/doc/book/syntax-index.md
diff --git a/src/doc/trpl/testing.md b/src/doc/book/testing.md
index 32f0d689e30..32f0d689e30 100644
--- a/src/doc/trpl/testing.md
+++ b/src/doc/book/testing.md
diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md
index 0c78f876aa0..0c78f876aa0 100644
--- a/src/doc/trpl/the-stack-and-the-heap.md
+++ b/src/doc/book/the-stack-and-the-heap.md
diff --git a/src/doc/trpl/trait-objects.md b/src/doc/book/trait-objects.md
index 8127b0898c4..8127b0898c4 100644
--- a/src/doc/trpl/trait-objects.md
+++ b/src/doc/book/trait-objects.md
diff --git a/src/doc/trpl/traits.md b/src/doc/book/traits.md
index 01cd20bc792..01cd20bc792 100644
--- a/src/doc/trpl/traits.md
+++ b/src/doc/book/traits.md
diff --git a/src/doc/trpl/type-aliases.md b/src/doc/book/type-aliases.md
index d175da35f5e..d175da35f5e 100644
--- a/src/doc/trpl/type-aliases.md
+++ b/src/doc/book/type-aliases.md
diff --git a/src/doc/trpl/ufcs.md b/src/doc/book/ufcs.md
index 7725970564b..7725970564b 100644
--- a/src/doc/trpl/ufcs.md
+++ b/src/doc/book/ufcs.md
diff --git a/src/doc/trpl/unsafe.md b/src/doc/book/unsafe.md
index 1b223365bd6..1b223365bd6 100644
--- a/src/doc/trpl/unsafe.md
+++ b/src/doc/book/unsafe.md
diff --git a/src/doc/trpl/unsized-types.md b/src/doc/book/unsized-types.md
index b1a2bb5d417..b1a2bb5d417 100644
--- a/src/doc/trpl/unsized-types.md
+++ b/src/doc/book/unsized-types.md
diff --git a/src/doc/trpl/variable-bindings.md b/src/doc/book/variable-bindings.md
index f3a5d1dd886..f3a5d1dd886 100644
--- a/src/doc/trpl/variable-bindings.md
+++ b/src/doc/book/variable-bindings.md
diff --git a/src/doc/trpl/vectors.md b/src/doc/book/vectors.md
index 7b826f08ae6..7b826f08ae6 100644
--- a/src/doc/trpl/vectors.md
+++ b/src/doc/book/vectors.md