Fix dead links in the guide and reorganize

Author: alexcrichton

mk/docs.mk

@@ -275,9 +275,8 @@ endif
 docs: $(DOC_TARGETS)
 compiler-docs: $(COMPILER_DOC_TARGETS)
 
-trpl: tmp/trpl.ok
+trpl: doc/book/index.html
 
-tmp/trpl.ok: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md)
+doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md)
 	$(Q)rm -rf doc/book
 	$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
-	$(Q)touch $@

mk/tests.mk

@@ -156,8 +156,8 @@ endef
 
 $(foreach doc,$(DOCS), \
   $(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
-$(foreach file,$(wildcard $(S)src/doc/trpl/src/*), \
-  $(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/src/%.md=trpl-%),$(file))))
+$(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
+  $(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
 
 ######################################################################
 # Main test targets

src/doc/trpl/SUMMARY.md

@@ -1,35 +1,36 @@
 # Summary
 
-* [I: The Basics](src/basic.md)
-    * [Installing Rust](src/installing-rust.md)
-    * [Hello, world!](src/hello-world.md)
-    * [Hello, Cargo!](src/hello-cargo.md)
-    * [Variable Bindings](src/variable-bindings.md)
-    * [If](src/if.md)
-    * [Functions](src/functions.md)
-    * [Comments](src/comments.md)
-    * [Compound Data Types](src/compound-data-types.md)
-    * [Match](src/match.md)
-    * [Looping](src/looping.md)
-    * [Strings](src/strings.md)
-    * [Arrays, Vectors, and Slices](src/arrays-vectors-and-slices.md)
-    * [Standard Input](src/standard-input.md)
-    * [Guessing Game](src/guessing-game.md)
-* [II: Intermedite Rust](src/intermediate.md)
-    * [Crates and Modules](src/crates-and-modules.md)
-    * [Testing](src/testing.md)
-    * [Pointers](src/pointers.md)
-    * [Patterns](src/patterns.md)
-    * [Method Syntax](src/method-syntax.md)
-    * [Closures](src/closures.md)
-    * [Iterators](src/iterators.md)
-    * [Generics](src/generics.md)
-    * [Traits](src/traits.md)
-    * [Tasks](src/tasks.md)
-    * [Error Handling](src/error-handling.md)
-* [III: Advanced Topics](src/advanced.md)
-    * [FFI](src/ffi.md)
-    * [Unsafe Code](src/unsafe.md)
-    * [Macros](src/macros.md)
-    * [Compiler Plugins](src/plugins.md)
-* [Conclusion](src/conclusion.md)
+* [I: The Basics](basic.md)
+    * [Installing Rust](installing-rust.md)
+    * [Hello, world!](hello-world.md)
+    * [Hello, Cargo!](hello-cargo.md)
+    * [Variable Bindings](variable-bindings.md)
+    * [If](if.md)
+    * [Functions](functions.md)
+    * [Comments](comments.md)
+    * [Compound Data Types](compound-data-types.md)
+    * [Match](match.md)
+    * [Looping](looping.md)
+    * [Strings](strings.md)
+    * [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md)
+    * [Standard Input](standard-input.md)
+    * [Guessing Game](guessing-game.md)
+* [II: Intermediate Rust](intermediate.md)
+    * [Crates and Modules](crates-and-modules.md)
+    * [Testing](testing.md)
+    * [Pointers](pointers.md)
+    * [Ownership](ownership.md)
+    * [Patterns](patterns.md)
+    * [Method Syntax](method-syntax.md)
+    * [Closures](closures.md)
+    * [Iterators](iterators.md)
+    * [Generics](generics.md)
+    * [Traits](traits.md)
+    * [Tasks](tasks.md)
+    * [Error Handling](error-handling.md)
+* [III: Advanced Topics](advanced.md)
+    * [FFI](ffi.md)
+    * [Unsafe Code](unsafe.md)
+    * [Macros](macros.md)
+    * [Compiler Plugins](plugins.md)
+* [Conclusion](conclusion.md)

src/doc/trpl/src/advanced.md src/doc/trpl/advanced.mdsrc/doc/trpl/src/advanced.md renamed to src/doc/trpl/advanced.md

@@ -1,4 +1,4 @@
-# Arrays, Vectors, and Slices
+% Arrays, Vectors, and Slices
 
 Like many programming languages, Rust has list types to represent a sequence of
 things. The most basic is the **array**, a fixed-size list of elements of the
@@ -48,7 +48,7 @@ errant access is the source of many bugs in other systems programming
 languages.
 
 A **vector** is a dynamic or "growable" array, implemented as the standard
-library type [`Vec<T>`](std/vec/) (we'll talk about what the `<T>` means
+library type [`Vec<T>`](../std/vec/) (we'll talk about what the `<T>` means
 later). Vectors are to arrays what `String` is to `&str`. You can create them
 with the `vec!` macro:
 

…oc/trpl/src/arrays-vectors-and-slices.md src/doc/trpl/arrays-vectors-and-slices.mdsrc/doc/trpl/src/arrays-vectors-and-slices.md renamed to src/doc/trpl/arrays-vectors-and-slices.md src/doc/trpl/src/arrays-vectors-and-slices.md renamed to src/doc/trpl/arrays-vectors-and-slices.md

@@ -1,4 +1,4 @@
-# Closures
+% Closures
 
 So far, we've made lots of functions in Rust, but we've given them all names.
 Rust also allows us to create anonymous functions. Rust's anonymous

src/doc/trpl/src/basic.md src/doc/trpl/basic.mdsrc/doc/trpl/src/basic.md renamed to src/doc/trpl/basic.md

@@ -1,4 +1,4 @@
-# Comments
+% Comments
 
 Now that we have some functions, it's a good idea to learn about comments.
 Comments are notes that you leave to other programmers to help explain things
@@ -42,5 +42,5 @@ fn hello(name: &str) {
 When writing doc comments, adding sections for any arguments, return values,
 and providing some examples of usage is very, very helpful.
 
-You can use the [`rustdoc`](rustdoc.html) tool to generate HTML documentation
+You can use the [`rustdoc`](../rustdoc.html) tool to generate HTML documentation
 from these doc comments.

src/doc/trpl/src/closures.md src/doc/trpl/closures.mdsrc/doc/trpl/src/closures.md renamed to src/doc/trpl/closures.md

@@ -1,4 +1,4 @@
-# Compound Data Types
+% Compound Data Types
 
 Rust, like many programming languages, has a number of different data types
 that are built-in. You've already done some simple work with integers and