src/doc/trpl -> src/doc/book

The book was located under 'src/doc/trpl' because originally, it was going to be hosted under that URL. Late in the game, before 1.0, we decided that /book was a better one, so we changed the output, but not the input. This causes confusion for no good reason. So we'll change the source directory to look like the output directory, like for every other thing in src/doc.
rust-lang · Nov 19, 2015 · 024aa9a · 024aa9a
1 parent 3e48b0e
commit 024aa9a
Show file tree

Hide file tree

Showing 72 changed files with 4 additions and 4 deletions.
diff --git 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 → src/doc/book/README.md b/src/doc/trpl/README.md → src/doc/book/README.md
diff --git a/src/doc/trpl/SUMMARY.md → src/doc/book/SUMMARY.md b/src/doc/trpl/SUMMARY.md → src/doc/book/SUMMARY.md
diff --git a/src/doc/trpl/advanced-linking.md → src/doc/book/advanced-linking.md b/src/doc/trpl/advanced-linking.md → src/doc/book/advanced-linking.md
diff --git a/src/doc/trpl/associated-constants.md → src/doc/book/associated-constants.md b/src/doc/trpl/associated-constants.md → src/doc/book/associated-constants.md
diff --git a/src/doc/trpl/associated-types.md → src/doc/book/associated-types.md b/src/doc/trpl/associated-types.md → src/doc/book/associated-types.md
diff --git a/src/doc/trpl/attributes.md → src/doc/book/attributes.md b/src/doc/trpl/attributes.md → src/doc/book/attributes.md
diff --git a/src/doc/trpl/benchmark-tests.md → src/doc/book/benchmark-tests.md b/src/doc/trpl/benchmark-tests.md → src/doc/book/benchmark-tests.md
diff --git a/src/doc/trpl/bibliography.md → src/doc/book/bibliography.md b/src/doc/trpl/bibliography.md → src/doc/book/bibliography.md
diff --git a/src/doc/trpl/borrow-and-asref.md → src/doc/book/borrow-and-asref.md b/src/doc/trpl/borrow-and-asref.md → src/doc/book/borrow-and-asref.md
diff --git a/src/doc/trpl/box-syntax-and-patterns.md → src/doc/book/box-syntax-and-patterns.md b/src/doc/trpl/box-syntax-and-patterns.md → src/doc/book/box-syntax-and-patterns.md
diff --git a/src/doc/trpl/casting-between-types.md → src/doc/book/casting-between-types.md b/src/doc/trpl/casting-between-types.md → src/doc/book/casting-between-types.md
diff --git a/src/doc/trpl/choosing-your-guarantees.md → src/doc/book/choosing-your-guarantees.md b/src/doc/trpl/choosing-your-guarantees.md → src/doc/book/choosing-your-guarantees.md
diff --git a/src/doc/trpl/closures.md → src/doc/book/closures.md b/src/doc/trpl/closures.md → src/doc/book/closures.md
diff --git a/src/doc/trpl/comments.md → src/doc/book/comments.md b/src/doc/trpl/comments.md → src/doc/book/comments.md
diff --git a/src/doc/trpl/compiler-plugins.md → src/doc/book/compiler-plugins.md b/src/doc/trpl/compiler-plugins.md → src/doc/book/compiler-plugins.md
diff --git a/src/doc/trpl/concurrency.md → src/doc/book/concurrency.md b/src/doc/trpl/concurrency.md → src/doc/book/concurrency.md
diff --git a/src/doc/trpl/conditional-compilation.md → src/doc/book/conditional-compilation.md b/src/doc/trpl/conditional-compilation.md → src/doc/book/conditional-compilation.md
diff --git a/src/doc/trpl/const-and-static.md → src/doc/book/const-and-static.md b/src/doc/trpl/const-and-static.md → src/doc/book/const-and-static.md
diff --git a/src/doc/trpl/crates-and-modules.md → src/doc/book/crates-and-modules.md b/src/doc/trpl/crates-and-modules.md → src/doc/book/crates-and-modules.md
diff --git a/src/doc/trpl/custom-allocators.md → src/doc/book/custom-allocators.md b/src/doc/trpl/custom-allocators.md → src/doc/book/custom-allocators.md
diff --git a/src/doc/trpl/deref-coercions.md → src/doc/book/deref-coercions.md b/src/doc/trpl/deref-coercions.md → src/doc/book/deref-coercions.md
diff --git a/src/doc/trpl/dining-philosophers.md → src/doc/book/dining-philosophers.md b/src/doc/trpl/dining-philosophers.md → src/doc/book/dining-philosophers.md
diff --git a/src/doc/trpl/documentation.md → src/doc/book/documentation.md b/src/doc/trpl/documentation.md → src/doc/book/documentation.md
diff --git a/src/doc/trpl/drop.md → src/doc/book/drop.md b/src/doc/trpl/drop.md → src/doc/book/drop.md
diff --git a/src/doc/trpl/effective-rust.md → src/doc/book/effective-rust.md b/src/doc/trpl/effective-rust.md → src/doc/book/effective-rust.md
diff --git a/src/doc/trpl/enums.md → src/doc/book/enums.md b/src/doc/trpl/enums.md → src/doc/book/enums.md
diff --git a/src/doc/trpl/error-handling.md → src/doc/book/error-handling.md b/src/doc/trpl/error-handling.md → src/doc/book/error-handling.md
diff --git a/src/doc/trpl/ffi.md → src/doc/book/ffi.md b/src/doc/trpl/ffi.md → src/doc/book/ffi.md
diff --git a/src/doc/trpl/functions.md → src/doc/book/functions.md b/src/doc/trpl/functions.md → src/doc/book/functions.md
diff --git a/src/doc/trpl/generics.md → src/doc/book/generics.md b/src/doc/trpl/generics.md → src/doc/book/generics.md
diff --git a/src/doc/trpl/getting-started.md → src/doc/book/getting-started.md b/src/doc/trpl/getting-started.md → src/doc/book/getting-started.md
diff --git a/src/doc/trpl/glossary.md → src/doc/book/glossary.md b/src/doc/trpl/glossary.md → src/doc/book/glossary.md
diff --git a/src/doc/trpl/guessing-game.md → src/doc/book/guessing-game.md b/src/doc/trpl/guessing-game.md → src/doc/book/guessing-game.md
diff --git a/src/doc/trpl/if-let.md → src/doc/book/if-let.md b/src/doc/trpl/if-let.md → src/doc/book/if-let.md
diff --git a/src/doc/trpl/if.md → src/doc/book/if.md b/src/doc/trpl/if.md → src/doc/book/if.md
diff --git a/src/doc/trpl/inline-assembly.md → src/doc/book/inline-assembly.md b/src/doc/trpl/inline-assembly.md → src/doc/book/inline-assembly.md
diff --git a/src/doc/trpl/intrinsics.md → src/doc/book/intrinsics.md b/src/doc/trpl/intrinsics.md → src/doc/book/intrinsics.md
diff --git a/src/doc/trpl/iterators.md → src/doc/book/iterators.md b/src/doc/trpl/iterators.md → src/doc/book/iterators.md
diff --git a/src/doc/trpl/lang-items.md → src/doc/book/lang-items.md b/src/doc/trpl/lang-items.md → src/doc/book/lang-items.md
diff --git a/src/doc/trpl/learn-rust.md → src/doc/book/learn-rust.md b/src/doc/trpl/learn-rust.md → src/doc/book/learn-rust.md
diff --git a/src/doc/trpl/lifetimes.md → src/doc/book/lifetimes.md b/src/doc/trpl/lifetimes.md → src/doc/book/lifetimes.md
diff --git a/src/doc/trpl/loops.md → src/doc/book/loops.md b/src/doc/trpl/loops.md → src/doc/book/loops.md
diff --git a/src/doc/trpl/macros.md → src/doc/book/macros.md b/src/doc/trpl/macros.md → src/doc/book/macros.md
diff --git a/src/doc/trpl/match.md → src/doc/book/match.md b/src/doc/trpl/match.md → src/doc/book/match.md
diff --git a/src/doc/trpl/method-syntax.md → src/doc/book/method-syntax.md b/src/doc/trpl/method-syntax.md → src/doc/book/method-syntax.md
diff --git a/src/doc/trpl/mutability.md → src/doc/book/mutability.md b/src/doc/trpl/mutability.md → src/doc/book/mutability.md
diff --git a/src/doc/trpl/nightly-rust.md → src/doc/book/nightly-rust.md b/src/doc/trpl/nightly-rust.md → src/doc/book/nightly-rust.md
diff --git a/src/doc/trpl/no-stdlib.md → src/doc/book/no-stdlib.md b/src/doc/trpl/no-stdlib.md → src/doc/book/no-stdlib.md
diff --git a/src/doc/trpl/operators-and-overloading.md → src/doc/book/operators-and-overloading.md b/src/doc/trpl/operators-and-overloading.md → src/doc/book/operators-and-overloading.md
diff --git a/src/doc/trpl/ownership.md → src/doc/book/ownership.md b/src/doc/trpl/ownership.md → src/doc/book/ownership.md
diff --git a/src/doc/trpl/patterns.md → src/doc/book/patterns.md b/src/doc/trpl/patterns.md → src/doc/book/patterns.md
diff --git a/src/doc/trpl/primitive-types.md → src/doc/book/primitive-types.md b/src/doc/trpl/primitive-types.md → src/doc/book/primitive-types.md
diff --git a/src/doc/trpl/raw-pointers.md → src/doc/book/raw-pointers.md b/src/doc/trpl/raw-pointers.md → src/doc/book/raw-pointers.md
diff --git a/src/doc/trpl/references-and-borrowing.md → src/doc/book/references-and-borrowing.md b/src/doc/trpl/references-and-borrowing.md → src/doc/book/references-and-borrowing.md
diff --git a/src/doc/trpl/release-channels.md → src/doc/book/release-channels.md b/src/doc/trpl/release-channels.md → src/doc/book/release-channels.md
diff --git a/src/doc/trpl/rust-inside-other-languages.md → src/doc/book/rust-inside-other-languages.md b/src/doc/trpl/rust-inside-other-languages.md → src/doc/book/rust-inside-other-languages.md
diff --git a/src/doc/trpl/slice-patterns.md → src/doc/book/slice-patterns.md b/src/doc/trpl/slice-patterns.md → src/doc/book/slice-patterns.md
diff --git a/src/doc/trpl/strings.md → src/doc/book/strings.md b/src/doc/trpl/strings.md → src/doc/book/strings.md
diff --git a/src/doc/trpl/structs.md → src/doc/book/structs.md b/src/doc/trpl/structs.md → src/doc/book/structs.md
diff --git a/src/doc/trpl/syntax-and-semantics.md → src/doc/book/syntax-and-semantics.md b/src/doc/trpl/syntax-and-semantics.md → src/doc/book/syntax-and-semantics.md
diff --git a/src/doc/trpl/syntax-index.md → src/doc/book/syntax-index.md b/src/doc/trpl/syntax-index.md → src/doc/book/syntax-index.md
diff --git a/src/doc/trpl/testing.md → src/doc/book/testing.md b/src/doc/trpl/testing.md → src/doc/book/testing.md
diff --git a/src/doc/trpl/the-stack-and-the-heap.md → src/doc/book/the-stack-and-the-heap.md b/src/doc/trpl/the-stack-and-the-heap.md → src/doc/book/the-stack-and-the-heap.md
diff --git a/src/doc/trpl/trait-objects.md → src/doc/book/trait-objects.md b/src/doc/trpl/trait-objects.md → src/doc/book/trait-objects.md
diff --git a/src/doc/trpl/traits.md → src/doc/book/traits.md b/src/doc/trpl/traits.md → src/doc/book/traits.md
diff --git a/src/doc/trpl/type-aliases.md → src/doc/book/type-aliases.md b/src/doc/trpl/type-aliases.md → src/doc/book/type-aliases.md
diff --git a/src/doc/trpl/ufcs.md → src/doc/book/ufcs.md b/src/doc/trpl/ufcs.md → src/doc/book/ufcs.md
diff --git a/src/doc/trpl/unsafe.md → src/doc/book/unsafe.md b/src/doc/trpl/unsafe.md → src/doc/book/unsafe.md
diff --git a/src/doc/trpl/unsized-types.md → src/doc/book/unsized-types.md b/src/doc/trpl/unsized-types.md → src/doc/book/unsized-types.md
diff --git a/src/doc/trpl/variable-bindings.md → src/doc/book/variable-bindings.md b/src/doc/trpl/variable-bindings.md → src/doc/book/variable-bindings.md
diff --git a/src/doc/trpl/vectors.md → src/doc/book/vectors.md b/src/doc/trpl/vectors.md → src/doc/book/vectors.md