Updated the user guide's config section to mention specifying plugin commands

Mentioned plugins in the README
Merge pull request #792 from rust-lang-nursery/custom-preprocessor
2025-12-28 12:41:16 -05:00 · 2018-10-20 14:16:07 +08:00 · 2018-10-20 14:01:51 +08:00 · 2018-10-16 00:02:12 +08:00 · 2018-10-15 18:52:37 +08:00 · 2018-09-25 19:48:20 +08:00
60 changed files with 1990 additions and 982 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,14 @@
 language: rust

+rust:
+  - stable
+  - beta
+  - nightly
+
+os:
+  - linux
+  - osx
+
 cache: 
  timeout: 360
  cargo: true
@@ -10,19 +19,10 @@ before_cache:
 env:
  global:
    - CRATE_NAME=mdbook
-    - TARGET=x86_64-unknown-linux-gnu
-
-install:
-  - sh ci/install.sh
-  - export PATH=$PATH:$HOME/.cargo/bin

 script:
-  - cargo build --all --no-default-features
-  - cargo build --verbose
-  - cargo test --verbose
-
-after_success:
-  - bash ci/github_pages.sh
+  - cargo test --all
+  - cargo test --all --no-default-features

 before_deploy:
  - sh ci/before_deploy.sh
@@ -40,8 +40,8 @@ deploy:

 branches:
  only:
-    - "/^v\\d+\\.\\d+\\.\\d+.*$/"
    - master
+    - /^v\d+\.\d+\.\d+.*$/

 notifications:
  email:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,6 +48,57 @@ mdBook builds on stable Rust, if you want to build mdBook from source, here are

 The resulting binary can be found in `mdBook/target/debug/` under the name `mdBook` or `mdBook.exe`.

+### Code Quality
+
+We love code quality and Rust has some excellent tools to assist you with contributions.
+
+#### Formatting Code with rustfmt
+
+Before you make your Pull Request to the project, please run it through the `rustfmt` utility.
+This will ensure we have good quality source code that is better for us all to maintain.
+
+[rustfmt](https://github.com/rust-lang-nursery/rustfmt) has a lot more information on the project.
+The quick guide is
+
+1. Install it
+    ```
+    rustup component add rustfmt-preview
+    ```
+1. You can now run `rustfmt` on a single file simply by...
+    ```
+    rustfmt src/path/to/your/file.rs
+    ```
+   ... or you can format the entire project with
+   ```
+   cargo fmt
+   ```
+   When run through `cargo` it will format all bin and lib files in the current crate.
+
+For more information, such as running it from your favourite editor, please see the `rustfmt` project. [rustfmt](https://github.com/rust-lang-nursery/rustfmt)
+
+
+#### Finding Issues with Clippy
+
+Clippy is a code analyser/linter detecting mistakes, and therfore helps to improve your code.
+Like formatting your code with `rustfmt`, running clippy regularly and before your Pull Request will
+help us maintain awesome code.
+
+The best documentation can be found over at [rust-clippy](https://github.com/rust-lang-nursery/rust-clippy)
+
+1. To install
+    ```
+    rustup update
+    rustup install nightly
+    rustup component add clippy-preview --toolchain=nightly
+    ```
+2. Running clippy
+    As you may notice from the previous step, Clippy is on the nightly branch, so running it is like
+    ```
+    cargo +nightly clippy
+    ```
+
+Clippy has an ever growing list of checks, that are managed in [lint files](https://rust-lang-nursery.github.io/rust-clippy/master/index.html).
+
 ### Making a pull-request

 When you feel comfortable that your changes could be integrated into mdBook, you can create a pull-request on GitHub.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,7 +12,7 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "matches 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -32,7 +32,7 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -42,20 +42,20 @@ name = "backtrace"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "backtrace-sys"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -63,7 +63,7 @@ name = "base64"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -102,7 +102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "byteorder"
-version = "1.2.3"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -115,7 +115,7 @@ name = "bytes"
 version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -126,12 +126,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "cfg-if"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "chrono"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -174,11 +174,6 @@ name = "difference"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "dtoa"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "either"
 version = "1.5.0"
@@ -189,23 +184,23 @@ name = "elasticlunr-rs"
 version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "strum_macros 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "env_logger"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -223,8 +218,8 @@ name = "filetime"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -235,7 +230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -243,7 +238,7 @@ name = "fsevent-sys"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -279,17 +274,18 @@ dependencies = [

 [[package]]
 name = "handlebars"
-version = "0.32.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -309,7 +305,7 @@ name = "html5ever"
 version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "markup5ever 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -363,7 +359,7 @@ name = "inotify"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -371,7 +367,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -429,17 +425,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "lazy_static"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]

 [[package]]
 name = "lazycell"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "lazycell"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
-version = "0.2.42"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -447,15 +451,15 @@ name = "log"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "log"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -488,9 +492,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf_codegen 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -503,37 +507,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "mdbook"
-version = "0.1.10"
+version = "0.2.2-alpha.0"
 dependencies = [
 "ammonia 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "handlebars 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "notify 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "open 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "pulldown-cmark-to-cmark 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "select 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
 "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "staticfile 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml-query 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -541,7 +545,7 @@ name = "memchr"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -569,7 +573,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -589,14 +593,25 @@ dependencies = [
 "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "mio-extras"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "miow"
 version = "0.1.5"
@@ -638,8 +653,8 @@ name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -657,12 +672,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "notify"
-version = "4.0.3"
+version = "4.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -671,9 +686,9 @@ dependencies = [
 "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "inotify 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -695,13 +710,16 @@ name = "num_cpus"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "open"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]

 [[package]]
 name = "percent-encoding"
@@ -715,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "pest_derive"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -746,7 +764,7 @@ version = "0.7.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -754,7 +772,7 @@ name = "phf_shared"
 version = "0.7.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -790,7 +808,7 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -833,30 +851,30 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "rand"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "rand"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -887,7 +905,7 @@ dependencies = [
 "aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -917,6 +935,11 @@ name = "rustc-serialize"
 version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "ryu"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "safemem"
 version = "0.2.0"
@@ -946,27 +969,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde"
-version = "1.0.70"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "serde_derive"
-version = "1.0.70"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -981,7 +1004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "siphasher"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -991,12 +1014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "slab"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "slab"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -1019,7 +1037,7 @@ dependencies = [
 "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1029,11 +1047,11 @@ name = "string_cache"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "phf_shared 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1070,9 +1088,9 @@ name = "strum_macros"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1097,11 +1115,11 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "0.14.5"
+version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1118,8 +1136,8 @@ name = "tempfile"
 version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1132,7 +1150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf-8 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf-8 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1142,7 +1160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf-8 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf-8 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1158,7 +1176,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1173,11 +1191,10 @@ dependencies = [

 [[package]]
 name = "thread_local"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1185,7 +1202,7 @@ name = "time"
 version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1195,7 +1212,7 @@ name = "toml"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1205,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "is-match 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1305,7 +1322,7 @@ dependencies = [

 [[package]]
 name = "utf-8"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -1330,7 +1347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "walkdir"
-version = "2.1.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1376,17 +1393,18 @@ dependencies = [

 [[package]]
 name = "ws"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1405,7 +1423,7 @@ dependencies = [
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a"
-"checksum backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "bff67d0c06556c0b8e6b5f090f0eac52d950d9dfd1d35ba04e4ca3543eaf6a7e"
+"checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0"
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c"
 "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
@@ -1413,20 +1431,19 @@ dependencies = [
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
-"checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9"
+"checksum byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8389c509ec62b9fe8eca58c502a0acaf017737355615243496cde4994f8fa4f9"
 "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27"
 "checksum bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e178b8e0e239e844b083d5a0d4a156b2654e67f9f80144d48398fcd736a24fb8"
 "checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275"
-"checksum cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e"
-"checksum chrono 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6962c635d530328acc53ac6a955e83093fedc91c5809dfac1fa60fa470830a37"
+"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
+"checksum chrono 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e48d85528df61dc964aa43c5f6ca681a19cfa74939b2348d204bd08a981f2fb0"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
 "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
 "checksum elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4837d77a1e157489a3933b743fd774ae75074e0e390b2b7f071530048a0d87ee"
-"checksum env_logger 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "7873e292d20e8778f951278972596b3df36ac72a65c5b406f6d4961070a870c1"
+"checksum env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f4d7e69c283751083d53d01eac767407343b8b69c4bd70058e08adc2637cb257"
 "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
 "checksum filetime 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f"
 "checksum fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c4bbbf71584aeed076100b5665ac14e3d85eeb31fdbb45fbd41ef9a682b5ec05"
@@ -1435,7 +1452,7 @@ dependencies = [
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
 "checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
-"checksum handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d89ec99d1594f285d4590fc32bac5f75cdab383f1123d504d27862c644a807dd"
+"checksum handlebars 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "478beb02b2c4c0977fcbd1f234f8c44eb7eca00f36138fab163d920acfa7f279"
 "checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90"
 "checksum html5ever 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b04478cf718862650a0bf66acaf8f2f8c906fbc703f35c916c1f4211b069a364"
 "checksum httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b6288d7db100340ca12873fd4d08ad1b8f206a9457798dfb17c018a33fee540"
@@ -1451,11 +1468,12 @@ dependencies = [
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fb497c35d362b6a331cfd94956a07fc2c78a4604cdbee844a81170386b996dd3"
+"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
 "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
-"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1"
+"checksum lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d33a48d0365c96081958cc663eef834975cb1e8d8bea3378513fc72bdbf11e50"
+"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2"
+"checksum log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cba860f648db8e6f269df990180c2217f333472b4a6e901e97446858487971e2"
 "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 "checksum maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
 "checksum markup5ever 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff834ac7123c6a37826747e5ca09db41fd7a83126792021c2e636ad174bb77d3"
@@ -1466,6 +1484,7 @@ dependencies = [
 "checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
 "checksum mio 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "4fcfcb32d63961fb6f367bfd5d21e4600b92cd310f71f9dca25acae196eb1560"
+"checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
@@ -1473,14 +1492,14 @@ dependencies = [
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
 "checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79"
-"checksum notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5c3812da3098f210a0bb440f9c008471a031aa4c1de07a264fdd75456c95a4eb"
+"checksum notify 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d023ef40ca7680784b07be3f49913e1ea176da1b63949f2eb2fed96438bd7f42"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
 "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
-"checksum open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c281318d992e4432cfa799969467003d05921582a7489a8325e37f8a450d5113"
+"checksum open 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eedfa0ca7b54d84d948bfd058b8f82e767d11f362dd78c36866fd1f69c175867"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
-"checksum pest_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab94faafeb93f4c5e3ce81ca0e5a779529a602ad5d09ae6d21996bfb8b6a52bf"
+"checksum pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3294f437119209b084c797604295f40227cffa35c57220b1e99a6ff3bf8ee4"
 "checksum phf 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "7d37a244c75a9748e049225155f56dbcb98fe71b192fd25fd23cb914b5ad62f2"
 "checksum phf_codegen 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4048fe7dd7a06b8127ecd6d3803149126e9b33c7558879846da3a63f734f2b"
 "checksum phf_generator 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "05a079dd052e7b674d21cb31cbb6c05efd56a2cd2827db7692e2f1a507ebd998"
@@ -1489,15 +1508,15 @@ dependencies = [
 "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 "checksum pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3a029430f0d744bc3d15dd474d591bed2402b645d024583082b9f63bb936dac6"
 "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-"checksum proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "cccdc7557a98fe98453030f077df7f3a042052fae465bb61d2c2c41435cfd9b6"
+"checksum proc-macro2 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5697238f0d893c7f0ecc59c0999f18d2af85e424de441178bcacc9f9e6cf67"
 "checksum pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdf85cda6cadfae5428a54661d431330b312bc767ddbc57adbedc24da66e32"
 "checksum pulldown-cmark-to-cmark 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57efca5f52f63336ee3a49bceee1a1169f18ef01c75aa7e71949441b49bbe7e4"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
-"checksum quote 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b71f9f575d55555aa9c06188be9d4e2bfc83ed02537948ac0d520c24d0419f1a"
-"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
-"checksum rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "12397506224b2f93e6664ffc4f664b29be8208e5157d3d90b44f09b5fae470ea"
+"checksum quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ed7d650913520df631972f21e104a4fa2f9c82a14afc65d17b388a2e29731e7c"
+"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
+"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
 "checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"
 "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
@@ -1506,19 +1525,19 @@ dependencies = [
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
 "checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+"checksum ryu 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0568787116e13c652377b6846f5931454a363a8fdf8ae50463ee40935b278b"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
 "checksum select 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7004292887d0a030e29abda3ae1b63a577c96a17e25d74eaa1952503e6c1c946"
 "checksum sequence_trie 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "32157204e5c9d3c04007bd7e56e96e987635ce0e8e23c085b1e403861b76c351"
-"checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920"
-"checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124"
-"checksum serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c6908c7b925cd6c590358a4034de93dbddb20c45e1d021931459fd419bf0e2"
+"checksum serde 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)" = "98b72cb11d2f90a50789254281aac9211092fd1ba87e067b45c94652fffe1cf1"
+"checksum serde_derive 1.0.72 (registry+https://github.com/rust-lang/crates.io-index)" = "ccb40724ad173e215530b5217ffba55cdf34ef811e90023a43c948c5b04dc41f"
+"checksum serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "44dd2cfde475037451fa99b7e5df77aa3cfd1536575fa8e7a538ab36dcde49ae"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-"checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e"
-"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
-"checksum slab 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdeff4cd9ecff59ec7e3744cbca73dfe5ac35c2aedb2cfba8a1c715a18912e9d"
+"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
 "checksum staticfile 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "babd3fa68bb7e3994ce181c5f21ff3ff5fffef7b18b8a10163b45e4dafc6fb86"
 "checksum string_cache 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "413fc7852aeeb5472f1986ef755f561ddf0c789d3d796e65f0b6fe293ecd4ef8"
 "checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
@@ -1529,7 +1548,7 @@ dependencies = [
 "checksum strum_macros 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1292d85e688e4696ecb69b2db2648994fb8af266974e89be53cefdf003861a5d"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
-"checksum syn 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4bad7abdf6633f07c7046b90484f1d9dc055eca39f8c991177b1046ce61dba9a"
+"checksum syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bfcbb0c068d0f642a0ffbd5c604965a360a61f99e8add013cef23a838614f3"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 "checksum tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c4b103c6d08d323b92ff42c8ce62abcd83ca8efa7fd5bf7927efefec75f58c76"
 "checksum tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1b72f8e2f5b73b65c315b1a70c730f24b9d7a25f39e98de8acbe2bb795caea"
@@ -1537,7 +1556,7 @@ dependencies = [
 "checksum termcolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "722426c4a0539da2c4ffd9b419d90ad540b4cff4a053be9069c908d4d07e2836"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
-"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
 "checksum toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a0263c6c02c4db6c8f7681f9fd35e90de799ebd4cfdeab77a38f4ff6b3d8c0d9"
 "checksum toml-query 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab234a943a2363ad774020e2f9474a38a85bc4396bace01a96380144aef17db3"
@@ -1555,17 +1574,17 @@ dependencies = [
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 "checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6"
-"checksum utf-8 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1262dfab4c30d5cb7c07026be00ee343a6cf5027fdc0104a9160f354e5db75c"
+"checksum utf-8 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bab35f71693630bb1953dce0f2bcd780e7cde025027124a202ac08a45ba25141"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "63636bd0eb3d00ccb8b9036381b526efac53caf112b7783b730ab3f8e44da369"
+"checksum walkdir 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1b768ba943161a9226ccd59b26bcd901e5d60e6061f4fcad3034784e0c7372b"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum wincolor 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9dc3aa9dcda98b5a16150c54619c1ead22e3d3a5d458778ae914be760aa981a"
-"checksum ws 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ccf752fee5350ca505fdb0b34d503b17d1528bd867561b7aa91d6ea750d5e972"
+"checksum ws 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "d2c221321dca56e6a80aa179d562e1fbe6ae116aeaa9205c76fa64e9e3c49dfc"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,11 @@
 [package]
 name = "mdbook"
-version = "0.1.10"
-authors = ["Mathieu David <mathieudavid@mathieudavid.org>", "Michael-F-Bryan <michaelfbryan@gmail.com>"]
+version = "0.2.2-alpha.0"
+authors = [
+    "Mathieu David <mathieudavid@mathieudavid.org>", 
+    "Michael-F-Bryan <michaelfbryan@gmail.com>",
+    "Matt Ickstadt <mattico8@gmail.com>"
+]
 description = "Create books from markdown files"
 documentation = "http://rust-lang-nursery.github.io/mdBook/index.html"
 repository = "https://github.com/rust-lang-nursery/mdBook"
@@ -13,7 +17,7 @@ exclude = ["book-example/*"]
 [dependencies]
 clap = "2.24"
 chrono = "0.4"
-handlebars = "0.32"
+handlebars = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 error-chain = "0.12"
--- a/README.md
+++ b/README.md
@@ -145,6 +145,57 @@ explanation, check out the [User Guide].

    Delete directory in which generated book is located.

+### 3rd Party Plugins
+
+The way a book is loaded and rendered can be configured by the user via third
+party plugins. These plugins are just programs which will be invoked during the
+build process and are split into roughly two categories, *preprocessors* and
+*renderers*.
+
+Preprocessors are used to transform a book before it is sent to a renderer. 
+One example would be to replace all occurrences of 
+`{{#include some_file.ext}}` with the contents of that file. Some existing 
+preprocessors are:
+
+- `index` - a built-in preprocessor (enabled by default) which will transform
+  all `README.md` chapters to `index.md` so `foo/README.md` can be accessed via
+  the url `foo/` when published to a browser
+- `links` - a built-in preprocessor (enabled by default) for expanding the
+  `{{# playpen}}` and `{{# include}}` helpers in a chapter.
+
+Renderers are given the final book so they can do something with it. This is
+typically used for, as the name suggests, rendering the document in a particular
+format, however there's nothing stopping a renderer from doing static analysis
+of a book in order to validate links or run tests. Some existing renderers are:
+
+- `html` - the built-in renderer which will generate a HTML version of the book
+- [`linkcheck`] - a backend which will check that all links are valid
+- [`epub`] - an experimental EPUB generator
+
+> **Note for Developers:** Feel free to send us a PR if you've developed your
+> own plugin and want it mentioned here.
+
+A preprocessor or renderer is enabled by installing the appropriate program and
+then mentioning it in the book's `book.toml` file.
+
+```console
+$ cargo install mdbook-linkcheck
+$ edit book.toml && cat book.toml
+[book]
+title = "My Awesome Book"
+authors = ["Michael-F-Bryan"]
+
+[output.html]
+
+[output.linkcheck]  # enable the "mdbook-linkcheck" renderer
+
+$ mdbook build
+2018-10-20 13:57:51 [INFO] (mdbook::book): Book building has started
+2018-10-20 13:57:51 [INFO] (mdbook::book): Running the html backend
+2018-10-20 13:57:53 [INFO] (mdbook::book): Running the linkcheck backend
+```
+
+For more information on the plugin system, consult the [User Guide].

 ### As a library

@@ -189,3 +240,5 @@ All the code in this repository is released under the ***Mozilla Public License
 [Rust]: https://www.rust-lang.org/
 [CLI docs]: http://rust-lang-nursery.github.io/mdBook/cli/init.html
 [master-docs]: http://rust-lang-nursery.github.io/mdBook/mdbook/
+[`linkcheck`]: https://crates.io/crates/mdbook-linkcheck
+[`epub`]: https://crates.io/crates/mdbook-epub
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,12 +36,12 @@ build: false

 # Equivalent to Travis' `script` phase
 test_script:
-  - cargo build --verbose
-  - cargo test --verbose
+  - cargo test --all
+  - cargo test --all --no-default-features

 before_deploy:
  # Generate artifacts for release
-  - cargo build --release
+  - cargo rustc --bin mdbook --release -- -C lto
  - mkdir staging
  - copy target\release\mdbook.exe staging
  - cd staging
@@ -61,3 +61,4 @@ deploy:
 branches:
  only:
    - master
+    - /^v\d+\.\d+\.\d+.*$/
--- a/book-example/src/README.md
+++ b/book-example/src/README.md
@@ -1,15 +1,25 @@
 # mdBook

-**mdBook** is a command line tool and Rust crate to create books using Markdown files. It's very similar to Gitbook but written in [Rust](http://www.rust-lang.org).
+**mdBook** is a command line tool and Rust crate to create books using Markdown
+files. It's very similar to Gitbook but written in
+[Rust](http://www.rust-lang.org).

-What you are reading serves as an example of the output of mdBook and at the same time as a high-level documentation.
+What you are reading serves as an example of the output of mdBook and at the
+same time as a high-level documentation.

-mdBook is free and open source, you can find the source code on [Github](https://github.com/rust-lang-nursery/mdBook). Issues and feature requests can be posted on the [Github Issue tracker](https://github.com/rust-lang-nursery/mdBook/issues).
+mdBook is free and open source, you can find the source code on
+[GitHub](https://github.com/rust-lang-nursery/mdBook). Issues and feature
+requests can be posted on the [GitHub issue
+tracker](https://github.com/rust-lang-nursery/mdBook/issues).

 ## API docs

-Alongside this book you can also read the [API docs](https://docs.rs/mdbook/*/mdbook/) generated by Rustdoc if you would like to use mdBook as a crate or write a new renderer and need a more low-level overview.
+Alongside this book you can also read the [API
+docs](https://docs.rs/mdbook/*/mdbook/) generated by Rustdoc if you would like
+to use mdBook as a crate or write a new renderer and need a more low-level
+overview.

 ## License

-mdBook, all the source code, is released under the [Mozilla Public License v2.0](https://www.mozilla.org/MPL/2.0/)
+mdBook, all the source code, is released under the [Mozilla Public License
+v2.0](https://www.mozilla.org/MPL/2.0/).
--- a/book-example/src/cli/README.md
+++ b/book-example/src/cli/README.md
@@ -1,30 +1,49 @@
 # Command Line Tool

-mdBook can be used either as a command line tool or a [Rust crate](https://crates.io/crates/mdbook).
-Let's focus on the command line tool capabilities first.
+mdBook can be used either as a command line tool or a [Rust
+crate](https://crates.io/crates/mdbook). Let's focus on the command line tool
+capabilities first.

-## Install
+## Install From Binaries
+
+Precompiled binaries are provided for major platforms on a best-effort basis.
+Visit [the releases page](https://github.com/rust-lang-nursery/mdBook/releases)
+to download the appropriate version for your platform.
+
+## Install From Source
+
+mdBook can also be installed from source

 ### Pre-requisite

-mdBook is written in **[Rust](https://www.rust-lang.org/)** and therefore needs to be compiled with **Cargo**, because we don't yet offer ready-to-go binaries. If you haven't already installed Rust, please go ahead and [install it](https://www.rust-lang.org/downloads.html) now.
+mdBook is written in **[Rust](https://www.rust-lang.org/)** and therefore needs
+to be compiled with **Cargo**. If you haven't already installed Rust, please go
+ahead and [install it](https://www.rust-lang.org/downloads.html) now.

 ### Install Crates.io version

-Installing mdBook is relatively easy if you already have Rust and Cargo installed. You just have to type this snippet in your terminal:
+Installing mdBook is relatively easy if you already have Rust and Cargo
+installed. You just have to type this snippet in your terminal:

 ```bash
 cargo install mdbook
 ```

-This will fetch the source code from [Crates.io](https://crates.io/) and compile it. You will have to add Cargo's `bin` directory to your `PATH`.
+This will fetch the source code for the latest release from
+[Crates.io](https://crates.io/) and compile it. You will have to add Cargo's
+`bin` directory to your `PATH`.

-Run `mdbook help` in your terminal to verify if it works. Congratulations, you have installed mdBook!
+Run `mdbook help` in your terminal to verify if it works. Congratulations, you
+have installed mdBook!


 ### Install Git version

-The **[git version](https://github.com/rust-lang-nursery/mdBook)** contains all the latest bug-fixes and features, that will be released in the next version on **Crates.io**, if you can't wait until the next release. You can build the git version yourself. Open your terminal and navigate to the directory of you choice. We need to clone the git repository and then build it with Cargo.
+The **[git version](https://github.com/rust-lang-nursery/mdBook)** contains all
+the latest bug-fixes and features, that will be released in the next version on
+**Crates.io**, if you can't wait until the next release. You can build the git
+version yourself. Open your terminal and navigate to the directory of you
+choice. We need to clone the git repository and then build it with Cargo.

 ```bash
 git clone --depth=1 https://github.com/rust-lang-nursery/mdBook.git
@@ -32,4 +51,5 @@ cd mdBook
 cargo build --release
 ```

-The executable `mdbook` will be in the `./target/release` folder, this should be added to the path.
+The executable `mdbook` will be in the `./target/release` folder, this should be
+added to the path.
--- a/book-example/src/cli/build.md
+++ b/book-example/src/cli/build.md
@@ -6,16 +6,16 @@ The build command is used to render your book:
 mdbook build
 ```

-It will try to parse your `SUMMARY.md` file to understand the structure of your book
-and fetch the corresponding files.
+It will try to parse your `SUMMARY.md` file to understand the structure of your
+book and fetch the corresponding files.

 The rendered output will maintain the same directory structure as the source for
 convenience. Large books will therefore remain structured when rendered.

 #### Specify a directory

-Like `init`, the `build` command can take a directory as an argument to use
-instead of the current working directory.
+The `build` command can take a directory as an argument to use as the book's
+root instead of the current working directory.

 ```bash
 mdbook build path/to/book
@@ -23,13 +23,16 @@ mdbook build path/to/book

 #### --open

-When you use the `--open` (`-o`) option, mdbook will open the rendered book in
+When you use the `--open` (`-o`) flag, mdbook will open the rendered book in
 your default web browser after building it.

 #### --dest-dir

-The `--dest-dir` (`-d`) option allows you to change the output directory for your book.
+The `--dest-dir` (`-d`) option allows you to change the output directory for the
+book. If not specified it will default to the value of the `build.build-dir` key
+in `book.toml`, or to `./book` relative to the book's root directory.

 -------------------

-***note:*** *make sure to run the build command in the root directory and not in the source directory*
+***Note:*** *Make sure to run the build command in the root directory and not in
+the source directory*
--- a/book-example/src/cli/clean.md
+++ b/book-example/src/cli/clean.md
@@ -7,12 +7,21 @@ artifacts.
 mdbook clean
 ```

-It will try to delete the built book. If a path is provided, it will be used.
-
 #### Specify a directory

-Like `init`, the `clean` command can take a directory as an argument to use
-instead of the normal build directory.
+The `clean` command can take a directory as an argument to use as the book's
+root instead of the current working directory.
+
+```bash
+mdbook clean path/to/book
+```
+
+#### --dest-dir
+
+The `--dest-dir` (`-d`) option allows you to override the book's output
+directory, which will be deleted by this command. If not specified it will
+default to the value of the `build.build-dir` key in `book.toml`, or to `./book`
+relative to the book's root directory.

 ```bash
 mdbook clean --dest-dir=path/to/book
--- a/book-example/src/cli/init.md
+++ b/book-example/src/cli/init.md
@@ -1,5 +1,7 @@
 # The init command
-There is some minimal boilerplate that is the same for every new book. It's for this purpose that mdBook includes an `init` command.
+
+There is some minimal boilerplate that is the same for every new book. It's for
+this purpose that mdBook includes an `init` command.

 The `init` command is used like this:

@@ -7,7 +9,8 @@ The `init` command is used like this:
 mdbook init
 ```

-When using the `init` command for the first time, a couple of files will be set up for you:
+When using the `init` command for the first time, a couple of files will be set
+up for you:
 ```bash
 book-test/
 ├── book
@@ -16,30 +19,36 @@ book-test/
    └── SUMMARY.md
 ```

- The `src` directory is were you write your book in markdown. It contains all the source files,
-configuration files, etc.
+- The `src` directory is were you write your book in markdown. It contains all
+  the source files, configuration files, etc.

- The `book` directory is where your book is rendered. All the output is ready to be uploaded
-to a server to be seen by your audience.
+- The `book` directory is where your book is rendered. All the output is ready
+  to be uploaded to a server to be seen by your audience.

- The `SUMMARY.md` file is the most important file, it's the skeleton of your book and is discussed in more detail in another  [chapter](../format/summary.md)
+- The `SUMMARY.md` file is the most important file, it's the skeleton of your
+  book and is discussed in more detail [in another
+  chapter](../format/summary.md)

-#### Tip & Trick: Hidden Feature
-When a `SUMMARY.md` file already exists, the `init` command will first parse it and generate the missing files according to the paths used in the `SUMMARY.md`. This allows you to think and create the whole structure of your book and then let mdBook generate it for you.
+#### Tip: Generate chapters from SUMMARY.md
+
+When a `SUMMARY.md` file already exists, the `init` command will first parse it
+and generate the missing files according to the paths used in the `SUMMARY.md`.
+This allows you to think and create the whole structure of your book and then
+let mdBook generate it for you.

 #### Specify a directory

-When using the `init` command, you can also specify a directory, instead of using the current working directory,
-by appending a path to the command:
+The `init` command can take a directory as an argument to use as the book's root
+instead of the current working directory.

 ```bash
 mdbook init path/to/book
 ```

-## --theme
+#### --theme

-When you use the `--theme` argument, the default theme will be copied into a directory
-called `theme` in your source directory so that you can modify it.
+When you use the `--theme` flag, the default theme will be copied into a
+directory called `theme` in your source directory so that you can modify it.

-The theme is selectively overwritten, this means that if you don't want to overwrite a
-specific file, just delete it and the default file will be used.
+The theme is selectively overwritten, this means that if you don't want to
+overwrite a specific file, just delete it and the default file will be used.
--- a/book-example/src/cli/serve.md
+++ b/book-example/src/cli/serve.md
@@ -1,40 +1,49 @@
 # The serve command

-The `serve` command is useful when you want to preview your book. It also does hot reloading of the webpage whenever a file changes.
-It achieves this by serving the books content over `localhost:3000` (unless otherwise configured, see below) and runs a websocket server on `localhost:3001` which triggers the reloads.
-This preferred by many for writing books with mdbook because it allows for you to see the result of your work instantly after every file change.
+The serve command is used to preview a book by serving it over HTTP at
+`localhost:3000` by default. Additionally it watches the book's directory for
+changes, rebuilding the book and refreshing clients for each change. A websocket
+connection is used to trigger the client-side refresh.

 #### Specify a directory

-Like `watch`, `serve` can take a directory as an argument to use instead of
-the current working directory.
+The `serve` command can take a directory as an argument to use as the book's
+root instead of the current working directory.

 ```bash
 mdbook serve path/to/book
 ```

-
 #### Server options

-`serve` has four options: the http port, the websocket port, the interface to serve on, and the public address of the server so that the browser may reach the websocket server.
+`serve` has four options: the HTTP port, the WebSocket port, the HTTP hostname
+to listen on, and the hostname for the browser to connect to for WebSockets.

-For example: suppose you had an nginx server for SSL termination which has a public address of 192.168.1.100 on port 80 and proxied that to 127.0.0.1 on port 8000. To run use the nginx proxy do:
+For example: suppose you have an nginx server for SSL termination which has a
+public address of 192.168.1.100 on port 80 and proxied that to 127.0.0.1 on port
+8000\. To run use the nginx proxy do:

 ```bash
-mdbook serve path/to/book -p 8000 -i 127.0.0.1 -a 192.168.1.100
+mdbook serve path/to/book -p 8000 -n 127.0.0.1 --websocket-hostname 192.168.1.100
 ```

-If you were to want live reloading for this you would need to proxy the websocket calls through nginx as well from `192.168.1.100:<WS_PORT>` to `127.0.0.1:<WS_PORT>`. The `-w` flag allows for the websocket port to be configured.
+If you were to want live reloading for this you would need to proxy the
+websocket calls through nginx as well from `192.168.1.100:<WS_PORT>` to
+`127.0.0.1:<WS_PORT>`. The `-w` flag allows for the websocket port to be
+configured.

 #### --open

-When you use the `--open` (`-o`) option, mdbook will open the book in your
-your default web browser after starting the server.
+When you use the `--open` (`-o`) flag, mdbook will open the book in your your
+default web browser after starting the server.

 #### --dest-dir

-The `--dest-dir` (`-d`) option allows you to change the output directory for your book.
+The `--dest-dir` (`-d`) option allows you to change the output directory for the
+book. If not specified it will default to the value of the `build.build-dir` key
+in `book.toml`, or to `./book` relative to the book's root directory.

 -----

-***note:*** *the `serve` command has not gotten a lot of testing yet, there could be some rough edges. If you discover a problem, please report it [on Github](https://github.com/rust-lang-nursery/mdBook/issues)*
+***Note:*** *The `serve` command is for testing, and is not intended to be a
+complete HTTP server for a website.*
--- a/book-example/src/cli/test.md
+++ b/book-example/src/cli/test.md
@@ -1,19 +1,52 @@
 # The test command

-When writing a book, you sometimes need to automate some tests. For example, [The Rust Programming Book](https://doc.rust-lang.org/stable/book/) uses a lot of code examples that could get outdated.
-Therefore it is very important for them to be able to automatically test these code examples.
+When writing a book, you sometimes need to automate some tests. For example,
+[The Rust Programming Book](https://doc.rust-lang.org/stable/book/) uses a lot
+of code examples that could get outdated. Therefore it is very important for
+them to be able to automatically test these code examples.

-mdBook supports a `test` command that will run all available tests in mdBook. At the moment, only one test is available:
-*"Test Rust code examples using Rustdoc"*, but I hope this will be expanded in the future to include more tests like:
+mdBook supports a `test` command that will run all available tests in a book. At
+the moment, only rustdoc tests are supported, but this may be expanded upon in
+the future.

- checking for broken links
- checking for unused files
- ...
+#### Disable tests on a code block

-In the future I would like the user to be able to enable / disable test from the `book.toml` configuration file and support custom tests.
+rustdoc doesn't test code blocks which contain the `ignore` attribute:
+
+    ```rust,ignore
+    fn main() {}
+    ```
+
+rustdoc also doesn't test code blocks which specify a language other than Rust:
+
+    ```markdown
+    **Foo**: _bar_
+    ```
+
+rustdoc *does* test code blocks which have no language specified:
+
+    ```
+    This is going to cause an error!
+    ```
+
+#### Specify a directory
+
+The `test` command can take a directory as an argument to use as the book's root
+instead of the current working directory.

-**How to use it:**
 ```bash
-$ mdbook test
-[*]: Testing file: "/mdBook/book-example/src/README.md”
+mdbook test path/to/book
 ```
+
+#### --library-path
+
+The `--library-path` (`-L`) option allows you to add directories to the library
+search path used by `rustdoc` when it builds and tests the examples. Multiple
+directories can be specified with multiple options (`-L foo -L bar`) or with a
+comma-delimited list (`-L foo,bar`).
+
+#### --dest-dir
+
+The `--dest-dir` (`-d`) option allows you to change the output directory for the
+book. If not specified it will default to the value of the `build.build-dir` key
+in `book.toml`, or to `./book` relative to the book's root directory.
--- a/book-example/src/cli/watch.md
+++ b/book-example/src/cli/watch.md
@@ -1,12 +1,14 @@
 # The watch command

-The `watch` command is useful when you want your book to be rendered on every file change.
-You could repeatedly issue `mdbook build` every time a file is changed. But using `mdbook watch` once will watch your files and will trigger a build automatically whenever you modify a file.
+The `watch` command is useful when you want your book to be rendered on every
+file change. You could repeatedly issue `mdbook build` every time a file is
+changed. But using `mdbook watch` once will watch your files and will trigger a
+build automatically whenever you modify a file.

 #### Specify a directory

-Like `init` and `build`, `watch` can take a directory as an argument to use
-instead of the current working directory.
+The `watch` command can take a directory as an argument to use as the book's
+root instead of the current working directory.

 ```bash
 mdbook watch path/to/book
@@ -19,8 +21,6 @@ your default web browser.

 #### --dest-dir

-The `--dest-dir` (`-d`) option allows you to change the output directory for your book.
-
-----
-
-***note:*** *the `watch` command has not gotten a lot of testing yet, there could be some rough edges. If you discover a problem, please report it [on Github](https://github.com/rust-lang-nursery/mdBook/issues)*
+The `--dest-dir` (`-d`) option allows you to change the output directory for the
+book. If not specified it will default to the value of the `build.build-dir` key
+in `book.toml`, or to `./book` relative to the book's root directory.
--- a/book-example/src/continuous-integration.md
+++ b/book-example/src/continuous-integration.md
@@ -26,7 +26,7 @@ before_script:
  - cargo install-update -a

 script:
-  - cd path/to/mybook && mdbook build && mdbook test
+  - mdbook build path/to/mybook && mdbook test path/to/mybook
 ```

 ## Deploying Your Book to GitHub Pages
@@ -34,9 +34,13 @@ script:
 Following these instructions will result in your book being published to GitHub
 pages after a successful CI run on your repository's `master` branch.

-First, create a new GitHub "Personal Access Token" with the "public_repo" permissions (or "repo" for private repositories). Go to your repository's Travis CI settings page and add an environment variable named `GITHUB_TOKEN` that is marked secure and *not* shown in the logs.
+First, create a new GitHub "Personal Access Token" with the "public_repo"
+permissions (or "repo" for private repositories). Go to your repository's Travis
+CI settings page and add an environment variable named `GITHUB_TOKEN` that is
+marked secure and *not* shown in the logs.

-Then, append this snippet to your `.travis.yml` and update the path to the `book` directory:
+Then, append this snippet to your `.travis.yml` and update the path to the
+`book` directory:

 ```yaml
 deploy:
--- a/book-example/src/for_developers/README.md
+++ b/book-example/src/for_developers/README.md
@@ -1,12 +1,12 @@
 # For Developers

-While `mdbook` is mainly used as a command line tool, you can also import the 
+While `mdbook` is mainly used as a command line tool, you can also import the
 underlying library directly and use that to manage a book. It also has a fairly
-flexible plugin mechanism, allowing you to create your own custom tooling and 
+flexible plugin mechanism, allowing you to create your own custom tooling and
 consumers (often referred to as *backends*) if you need to do some analysis of
 the book or render it in a different format.

-The *For Developers* chapters are here to show you the more advanced usage of 
+The *For Developers* chapters are here to show you the more advanced usage of
 `mdbook`.

 The two main ways a developer can hook into the book's build process is via,
@@ -32,15 +32,15 @@ The process of rendering a book project goes through several steps.

 The `mdbook` binary is just a wrapper around the `mdbook` crate, exposing its
 functionality as a command-line program. As such it is quite easy to create your
-own programs which use `mdbook` internally, adding your own functionality (e.g. 
+own programs which use `mdbook` internally, adding your own functionality (e.g.
 a custom preprocessor) or tweaking the build process.

 The easiest way to find out how to use the `mdbook` crate is by looking at the
-[API Docs]. The top level documentation explains how one would use the 
+[API Docs]. The top level documentation explains how one would use the
 [`MDBook`] type to load and build a book, while the [config] module gives a good
 explanation on the configuration system.


 [`MDBook`]: http://rust-lang-nursery.github.io/mdBook/mdbook/book/struct.MDBook.html
-[API Docs]: http://rust-lang-nursery.github.io/mdBook/mdbook/
+[API Docs]: https://docs.rs/mdbook/*/mdbook/
 [config]: file:///home/michael/Documents/forks/mdBook/target/doc/mdbook/config/index.html
--- a/book-example/src/for_developers/backends.md
+++ b/book-example/src/for_developers/backends.md
@@ -1,11 +1,11 @@
 # Alternate Backends

-A "backend" is simply a program which `mdbook` will invoke during the book 
+A "backend" is simply a program which `mdbook` will invoke during the book
 rendering process. This program is passed a JSON representation of the book and
-configuration information via `stdin`. Once the backend receives this 
+configuration information via `stdin`. Once the backend receives this
 information it is free to do whatever it wants.

-There are already several alternate backends on GitHub which can be used as a 
+There are already several alternate backends on GitHub which can be used as a
 rough example of how this is accomplished in practice.

 - [mdbook-linkcheck] - a simple program for verifying the book doesn't contain
@@ -21,7 +21,7 @@ no reason why it couldn't be accomplished using something like Python or Ruby.

 ## Setting Up

-First you'll want to create a new binary program and add `mdbook` as a 
+First you'll want to create a new binary program and add `mdbook` as a
 dependency.

 ```
@@ -30,8 +30,8 @@ $ cd mdbook-wordcount
 $ cargo add mdbook
 ```

-When our `mdbook-wordcount` plugin is invoked, `mdbook` will send it a JSON 
-version of [`RenderContext`] via our plugin's `stdin`. For convenience, there's 
+When our `mdbook-wordcount` plugin is invoked, `mdbook` will send it a JSON
+version of [`RenderContext`] via our plugin's `stdin`. For convenience, there's
 a [`RenderContext::from_json()`] constructor which will load a `RenderContext`.

 This is all the boilerplate necessary for our backend to load the book.
@@ -49,9 +49,9 @@ fn main() {
 }
 ```

-> **Note:** The `RenderContext` contains a `version` field. This lets backends 
+> **Note:** The `RenderContext` contains a `version` field. This lets backends
  figure out whether they are compatible with the version of `mdbook` it's being
-  called by. This `version` comes directly from the corresponding field in 
+  called by. This `version` comes directly from the corresponding field in
  `mdbook`'s `Cargo.toml`. 
  
  It is recommended that backends use the [`semver`] crate to inspect this field
@@ -60,7 +60,7 @@ fn main() {

 ## Inspecting the Book

-Now our backend has a copy of the book, lets count how many words are in each 
+Now our backend has a copy of the book, lets count how many words are in each
 chapter!

 Because the `RenderContext` contains a [`Book`] field (`book`), and a `Book` has
@@ -89,8 +89,8 @@ fn count_words(ch: &Chapter) -> usize {

 ## Enabling the Backend

-Now we've got the basics running, we want to actually use it. First, install
-the program.
+Now we've got the basics running, we want to actually use it. First, install the
+program.

 ```
 $ cargo install
@@ -110,15 +110,14 @@ Then `cd` to the particular book you'd like to count the words of and update its
 + [output.wordcount]
 ```

-When it loads a book into memory, `mdbook` will inspect your `book.toml` file 
-to try and figure out which backends to use by looking for all `output.*`
-tables. If none are provided it'll fall back to using the default HTML
-renderer. 
+When it loads a book into memory, `mdbook` will inspect your `book.toml` file to
+try and figure out which backends to use by looking for all `output.*` tables.
+If none are provided it'll fall back to using the default HTML renderer. 

-Notably, this means if you want to add your own custom backend you'll also
-need to make sure to add the HTML backend, even if its table just stays empty.
+Notably, this means if you want to add your own custom backend you'll also need
+to make sure to add the HTML backend, even if its table just stays empty.

-Now you just need to build your book like normal, and everything should *Just 
+Now you just need to build your book like normal, and everything should *Just
 Work*.

 ```
@@ -145,11 +144,11 @@ Alternate Backends: 710
 Contributors: 85
 ```

-The reason we didn't need to specify the full name/path of our `wordcount` 
-backend is because `mdbook` will try to *infer* the program's name via 
-convention. The executable for the `foo` backend is typically called 
+The reason we didn't need to specify the full name/path of our `wordcount`
+backend is because `mdbook` will try to *infer* the program's name via
+convention. The executable for the `foo` backend is typically called
 `mdbook-foo`, with an associated `[output.foo]` entry in the `book.toml`. To
-explicitly tell `mdbook` what command to invoke (it may require command-line 
+explicitly tell `mdbook` what command to invoke (it may require command-line
 arguments or be an interpreted script), you can use the `command` field.

 ```diff
@@ -168,16 +167,16 @@ arguments or be an interpreted script), you can use the `command` field.
 ## Configuration

 Now imagine you don't want to count the number of words on a particular chapter
-(it might be generated text/code, etc). The canonical way to do this is via
-the usual `book.toml` configuration file by adding items to your `[output.foo]` 
+(it might be generated text/code, etc). The canonical way to do this is via the
+usual `book.toml` configuration file by adding items to your `[output.foo]`
 table. 

 The `Config` can be treated roughly as a nested hashmap which lets you call
 methods like `get()` to access the config's contents, with a
-`get_deserialized()` convenience method for retrieving a value and
-automatically deserializing to some arbitrary type `T`.
+`get_deserialized()` convenience method for retrieving a value and automatically
+deserializing to some arbitrary type `T`.

-To implement this, we'll create our own serializable `WordcountConfig` struct 
+To implement this, we'll create our own serializable `WordcountConfig` struct
 which will encapsulate all configuration for this backend.

 First add `serde` and `serde_derive` to your `Cargo.toml`,
@@ -229,7 +228,7 @@ and then add a check to make sure we skip ignored chapters.

 ## Output and Signalling Failure

-While it's nice to print word counts to the terminal when a book is built, it 
+While it's nice to print word counts to the terminal when a book is built, it
 might also be a good idea to output them to a file somewhere. `mdbook` tells a
 backend where it should place any generated output via the `destination` field
 in [`RenderContext`].
@@ -264,7 +263,7 @@ in [`RenderContext`].
 > so it's always a good idea to create it with `fs::create_dir_all()`.

 There's always the possibility that an error will occur while processing a book
-(just look at all the `unwrap()`'s we've written already), so `mdbook` will 
+(just look at all the `unwrap()`'s we've written already), so `mdbook` will
 interpret a non-zero exit code as a rendering failure.

 For example, if we wanted to make sure all chapters have an *even* number of
@@ -315,27 +314,27 @@ init: 283
 init has an odd number of words!
 2018-01-16 21:21:39 [ERROR] (mdbook::renderer): Renderer exited with non-zero return code.
 2018-01-16 21:21:39 [ERROR] (mdbook::utils): Error: Rendering failed
-2018-01-16 21:21:39 [ERROR] (mdbook::utils): 	Caused By: The "mdbook-wordcount" renderer failed
+2018-01-16 21:21:39 [ERROR] (mdbook::utils):    Caused By: The "mdbook-wordcount" renderer failed
 ```

 As you've probably already noticed, output from the plugin's subprocess is
-immediately passed through to the user. It is encouraged for plugins to
-follow the "rule of silence" and only generate output when necessary (e.g. an
-error in generation or a warning).
+immediately passed through to the user. It is encouraged for plugins to follow
+the "rule of silence" and only generate output when necessary (e.g. an error in
+generation or a warning).

-All environment variables are passed through to the backend, allowing you to
-use the usual `RUST_LOG` to control logging verbosity.
+All environment variables are passed through to the backend, allowing you to use
+the usual `RUST_LOG` to control logging verbosity.


 ## Wrapping Up

 Although contrived, hopefully this example was enough to show how you'd create
-an alternate backend for `mdbook`. If you feel it's missing something, don't 
+an alternate backend for `mdbook`. If you feel it's missing something, don't
 hesitate to create an issue in the [issue tracker] so we can improve the user
 guide.

 The existing backends mentioned towards the start of this chapter should serve
-as a good example of how it's done in real life, so feel free to skim through 
+as a good example of how it's done in real life, so feel free to skim through
 the source code or ask questions.


@@ -348,5 +347,5 @@ the source code or ask questions.
 [`semver`]: https://crates.io/crates/semver
 [`Book`]: http://rust-lang-nursery.github.io/mdBook/mdbook/book/struct.Book.html
 [`Book::iter()`]: http://rust-lang-nursery.github.io/mdBook/mdbook/book/struct.Book.html#method.iter
-[`Config`]: http://rust-lang-nursery.github.io/mdBook/mdbook/config/struct.Config.html 
+[`Config`]: http://rust-lang-nursery.github.io/mdBook/mdbook/config/struct.Config.html
 [issue tracker]: https://github.com/rust-lang-nursery/mdBook/issues
--- a/book-example/src/for_developers/preprocessors.md
+++ b/book-example/src/for_developers/preprocessors.md
@@ -11,64 +11,79 @@ the book. Possible use cases are:
  mathjax equivalents


-## Implementing a Preprocessor
+## Hooking Into MDBook

-A preprocessor is represented by the `Preprocessor` trait.
+MDBook uses a fairly simple mechanism for discovering third party plugins.
+A new table is added to `book.toml` (e.g. `preprocessor.foo` for the `foo`
+preprocessor) and then `mdbook` will try to invoke the `mdbook-foo` program as
+part of the build process.

-```rust
-pub trait Preprocessor {
-    fn name(&self) -> &str;
-    fn run(&self, ctx: &PreprocessorContext, book: &mut Book) -> Result<()>;
-}
+While preprocessors can be hard-coded to specify which backend it should be run
+for (e.g. it doesn't make sense for MathJax to be used for non-HTML renderers)
+with the `preprocessor.foo.renderer` key.
+
+```toml
+[book]
+title = "My Book"
+authors = ["Michael-F-Bryan"]
+
+[preprocessor.foo]
+# The command can also be specified manually
+command = "python3 /path/to/foo.py"
+# Only run the `foo` preprocessor for the HTML and EPUB renderer
+renderer = ["html", "epub"]
 ```

-Where the `PreprocessorContext` is defined as
+In typical unix style, all inputs to the plugin will be written to `stdin` as
+JSON and `mdbook` will read from `stdout` if it is expecting output.
+
+The easiest way to get started is by creating your own implementation of the
+`Preprocessor` trait (e.g. in `lib.rs`) and then creating a shell binary which
+translates inputs to the correct `Preprocessor` method. For convenience, there
+is [an example no-op preprocessor] in the `examples/` directory which can easily
+be adapted for other preprocessors.
+
+<details>
+<summary>Example no-op preprocessor</summary>

 ```rust
-pub struct PreprocessorContext {
-    pub root: PathBuf,
-    pub config: Config,
-}
+// nop-preprocessors.rs
+
+{{#include ../../../examples/nop-preprocessor.rs}}
 ```
+</details>

-## A complete Example
+## Hints For Implementing A Preprocessor

-The magic happens within the `run(...)` method of the [`Preprocessor`][preprocessor-docs] trait implementation.
+By pulling in `mdbook` as a library, preprocessors can have access to the
+existing infrastructure for dealing with books.

-As direct access to the chapters is not possible, you will probably end up iterating
-them using `for_each_mut(...)`:
+For example, a custom preprocessor could use the
+[`CmdPreprocessor::parse_input()`] function to deserialize the JSON written to
+`stdin`. Then each chapter of the `Book` can be mutated in-place via
+[`Book::for_each_mut()`], and then written to `stdout` with the `serde_json`
+crate.
+
+Chapters can be accessed either directly (by recursively iterating over
+chapters) or via the `Book::for_each_mut()` convenience method.
+
+The `chapter.content` is just a string which happens to be markdown. While it's
+entirely possible to use regular expressions or do a manual find & replace,
+you'll probably want to process the input into something more computer-friendly.
+The [`pulldown-cmark`][pc] crate implements a production-quality event-based
+Markdown parser, with the [`pulldown-cmark-to-cmark`][pctc] allowing you to
+translate events back into markdown text.
+
+The following code block shows how to remove all emphasis from markdown,
+without accidentally breaking the document.

 ```rust
-book.for_each_mut(|item: &mut BookItem| {
-    if let BookItem::Chapter(ref mut chapter) = *item {
-      eprintln!("{}: processing chapter '{}'", self.name(), chapter.name);
-      res = Some(
-          match Deemphasize::remove_emphasis(&mut num_removed_items, chapter) {
-              Ok(md) => {
-                  chapter.content = md;
-                  Ok(())
-              }
-              Err(err) => Err(err),
-          },
-      );
-  }
-});
-```
-
-The `chapter.content` is just a markdown formatted string, and you will have to
-process it in some way. Even though it's entirely possible to implement some sort of
-manual find & replace operation, if that feels too unsafe you can use [`pulldown-cmark`][pc]
-to parse the string into events and work on them instead.
-
-Finally you can use [`pulldown-cmark-to-cmark`][pctc] to transform these events back to
-a string.
-
-The following code block shows how to remove all emphasis from markdown, and do so
-safely.
-
-```rust
-fn remove_emphasis(num_removed_items: &mut i32, chapter: &mut Chapter) -> Result<String> {
+fn remove_emphasis(
+    num_removed_items: &mut usize,
+    chapter: &mut Chapter,
+) -> Result<String> {
    let mut buf = String::with_capacity(chapter.content.len());
+
    let events = Parser::new(&chapter.content).filter(|e| {
        let should_keep = match *e {
            Event::Start(Tag::Emphasis)
@@ -82,15 +97,19 @@ fn remove_emphasis(num_removed_items: &mut i32, chapter: &mut Chapter) -> Result
        }
        should_keep
    });
-    cmark(events, &mut buf, None)
-        .map(|_| buf)
-        .map_err(|err| Error::from(format!("Markdown serialization failed: {}", err)))
+
+    cmark(events, &mut buf, None).map(|_| buf).map_err(|err| {
+        Error::from(format!("Markdown serialization failed: {}", err))
+    })
 }
 ```

 For everything else, have a look [at the complete example][example].

-[preprocessor-docs]: https://docs.rs/mdbook/0.1.3/mdbook/preprocess/trait.Preprocessor.html
+[preprocessor-docs]: https://docs.rs/mdbook/latest/mdbook/preprocess/trait.Preprocessor.html
 [pc]: https://crates.io/crates/pulldown-cmark
 [pctc]: https://crates.io/crates/pulldown-cmark-to-cmark
 [example]: https://github.com/rust-lang-nursery/mdBook/blob/master/examples/de-emphasize.rs
+[an example no-op preprocessor]: https://github.com/rust-lang-nursery/mdBook/blob/master/examples/nop-preprocessor.rs
+[`CmdPreprocessor::parse_input()`]: https://docs.rs/mdbook/latest/mdbook/preprocess/trait.Preprocessor.html#method.parse_input
+[`Book::for_each_mut()`]: https://docs.rs/mdbook/latest/mdbook/book/struct.Book.html#method.for_each_mut
--- a/book-example/src/format/config.md
+++ b/book-example/src/format/config.md
@@ -14,6 +14,10 @@ description = "The example book covers examples."
 build-dir = "my-example-book"
 create-missing = false

+[preprocess.index]
+
+[preprocess.links]
+
 [output.html]
 additional-css = ["custom.css"]

@@ -23,9 +27,9 @@ limit-results = 15

 ## Supported configuration options

-It is important to note that **any** relative path specified in the in the configuration will
-always be taken relative from the root of the book where the configuration file is located.
-
+It is important to note that **any** relative path specified in the in the
+configuration will always be taken relative from the root of the book where the
+configuration file is located.

 ### General metadata

@@ -58,13 +62,28 @@ This controls the build process of your book.
  will be created when the book is built (i.e. `create-missing = true`). If this
  is `false` then the build process will instead exit with an error if any files
  do not exist.
- **preprocess:** Specify which preprocessors to be applied. Default is `["links", "index"]`. To disable default preprocessors, pass an empty array `[]` in.
+- **use-default-preprocessors:** Disable the default preprocessors of (`links` &
+  `index`) by setting this option to `false`.

+  If you have the same, and/or other preprocessors declared via their table
+  of configuration, they will run instead.
+
+  - For clarity, with no preprocessor configuration, the default `links` and 
+    `index` will run.
+  - Setting `use-default-preprocessors = false` will disable these
+    default preprocessors from running.
+  - Adding `[preprocessor.links]`, for example, will ensure, regardless of 
+    `use-default-preprocessors` that `links` it will run.
+
+## Configuring Preprocessors

 The following preprocessors are available and included by default:

- `links`: Expand the `{{# playpen}}` and `{{# include}}` handlebars helpers in a chapter.
- `index`: Convert all chapter files named `README.md` into `index.md`. That is to say, all `README.md` would be rendered to an index file `index.html` in the rendered book.
+- `links`: Expand the `{{ #playpen }}` and `{{ #include }}` handlebars
+  helpers in a chapter to include the contents of a file.
+- `index`: Convert all chapter files named `README.md` into `index.md`. That is
+  to say, all `README.md` would be rendered to an index file `index.html` in the
+  rendered book.


 **book.toml**
@@ -72,36 +91,78 @@ The following preprocessors are available and included by default:
 [build]
 build-dir = "build"
 create-missing = false
-preprocess = ["links", "index"]
+
+[preprocess.links]
+
+[preprocess.index]
 ```

+### Custom Preprocessor Configuration
+
+Like renderers, preprocessor will need to be given its own table (e.g.
+`[preprocessor.mathjax]`). In the section, you may then pass extra
+configuration to the preprocessor by adding key-value pairs to the table.
+
+For example
+
+```
+[preprocess.links]
+# set the renderers this preprocessor will run for
+renderers = ["html"]
+some_extra_feature = true
+```
+
+#### Locking a Preprocessor dependency to a renderer
+
+You can explicitly specify that a preprocessor should run for a renderer by
+binding the two together.
+
+```
+[preprocessor.mathjax]
+renderers = ["html"]  # mathjax only makes sense with the HTML renderer
+```
+
+### Provide Your Own Command
+
+By default when you add a `[preprocessor.foo]` table to your `book.toml` file,
+`mdbook` will try to invoke the `mdbook-foo` executa`ble. If you want to use a
+different program name or pass in command-line arguments, this behaviour can
+be overridden by adding a `command` field.
+
+```toml
+[preprocessor.random]
+command = "python random.py"
+```
+
+## Configuring Renderers
+
 ### HTML renderer options
+
 The HTML renderer has a couple of options as well. All the options for the
 renderer need to be specified under the TOML table `[output.html]`.

 The following configuration options are available:

- **theme:** mdBook comes with a default theme and all the resource files
-  needed for it. But if this option is set, mdBook will selectively overwrite
-  the theme files with the ones found in the specified folder.
- **curly-quotes:** Convert straight quotes to curly quotes, except for
-  those that occur in code blocks and code spans. Defaults to `false`.
- **google-analytics:** If you use Google Analytics, this option lets you
-  enable it by simply specifying your ID in the configuration file.
- **additional-css:** If you need to slightly change the appearance of your
-  book without overwriting the whole style, you can specify a set of
-  stylesheets that will be loaded after the default ones where you can
-  surgically change the style.
+- **theme:** mdBook comes with a default theme and all the resource files needed
+  for it. But if this option is set, mdBook will selectively overwrite the theme
+  files with the ones found in the specified folder.
+- **curly-quotes:** Convert straight quotes to curly quotes, except for those
+  that occur in code blocks and code spans. Defaults to `false`.
+- **google-analytics:** If you use Google Analytics, this option lets you enable
+  it by simply specifying your ID in the configuration file.
+- **additional-css:** If you need to slightly change the appearance of your book
+  without overwriting the whole style, you can specify a set of stylesheets that
+  will be loaded after the default ones where you can surgically change the
+  style.
 - **additional-js:** If you need to add some behaviour to your book without
-  removing the current behaviour, you can specify a set of JavaScript files
-  that will be loaded alongside the default one.
+  removing the current behaviour, you can specify a set of JavaScript files that
+  will be loaded alongside the default one.
 - **no-section-label:** mdBook by defaults adds section label in table of
-  contents column. For example, "1.", "2.1". Set this option to true to
-  disable those labels. Defaults to `false`.
+  contents column. For example, "1.", "2.1". Set this option to true to disable
+  those labels. Defaults to `false`.
 - **playpen:** A subtable for configuring various playpen settings.
- **search:** A subtable for configuring the in-browser search
-  functionality. mdBook must be compiled with the `search` feature enabled
-  (on by default).
+- **search:** A subtable for configuring the in-browser search functionality.
+  mdBook must be compiled with the `search` feature enabled (on by default).

 Available configuration options for the `[output.html.playpen]` table:

@@ -115,27 +176,27 @@ Available configuration options for the `[output.html.search]` table:

 - **enable:** Enables the search feature. Defaults to `true`.
 - **limit-results:** The maximum number of search results. Defaults to `30`.
- **teaser-word-count:** The number of words used for a search result teaser. 
+- **teaser-word-count:** The number of words used for a search result teaser.
  Defaults to `30`.
- **use-boolean-and:** Define the logical link between multiple search words. 
-  If true, all search words must appear in each result. Defaults to `true`.
+- **use-boolean-and:** Define the logical link between multiple search words. If
+  true, all search words must appear in each result. Defaults to `true`.
 - **boost-title:** Boost factor for the search result score if a search word
  appears in the header. Defaults to `2`.
- **boost-hierarchy:** Boost factor for the search result score if a search
-  word appears in the hierarchy. The hierarchy contains all titles of the
-  parent documents and all parent headings. Defaults to `1`.
- **boost-paragraph:** Boost factor for the search result score if a search 
-  word appears in the text. Defaults to `1`.
- **expand:** True if search should match longer results e.g. search `micro` 
+- **boost-hierarchy:** Boost factor for the search result score if a search word
+  appears in the hierarchy. The hierarchy contains all titles of the parent
+  documents and all parent headings. Defaults to `1`.
+- **boost-paragraph:** Boost factor for the search result score if a search word
+  appears in the text. Defaults to `1`.
+- **expand:** True if search should match longer results e.g. search `micro`
  should match `microwave`. Defaults to `true`.
 - **heading-split-level:** Search results will link to a section of the document
-  which contains the result. Documents are split into sections by headings
-  this level or less.
-  Defaults to `3`. (`### This is a level 3 heading`)
- **copy-js:** Copy JavaScript files for the search implementation to the
-  output directory. Defaults to `true`.
+  which contains the result. Documents are split into sections by headings this
+  level or less. Defaults to `3`. (`### This is a level 3 heading`)
+- **copy-js:** Copy JavaScript files for the search implementation to the output
+  directory. Defaults to `true`.
+
+This shows all available HTML output options in the **book.toml**:

-This shows all available options in the **book.toml**:
 ```toml
 [book]
 title = "Example book"
@@ -172,6 +233,16 @@ heading-split-level = 3
 copy-js = true
 ```

+### Custom Renderers
+
+A custom renderer can be enabled by adding a `[output.foo]` table to your 
+`book.toml`. Similar to [preprocessors](#configuring-preprocessors) this will 
+instruct `mdbook` to pass a representation of the book to `mdbook-foo` for 
+rendering.
+
+Custom renderers will have access to all configuration within their table
+(i.e. anything under `[output.foo]`), and the command to be invoked can be 
+manually specified with the `command` field.

 ## Environment Variables

@@ -180,10 +251,10 @@ corresponding environment variable. Because many operating systems restrict
 environment variables to be alphanumeric characters or `_`, the configuration
 key needs to be formatted slightly differently to the normal `foo.bar.baz` form.

-Variables starting with `MDBOOK_` are used for configuration. The key is
-created by removing the `MDBOOK_` prefix and turning the resulting
-string into `kebab-case`. Double underscores (`__`) separate nested
-keys, while a single underscore (`_`) is replaced with a dash (`-`).
+Variables starting with `MDBOOK_` are used for configuration. The key is created
+by removing the `MDBOOK_` prefix and turning the resulting string into
+`kebab-case`. Double underscores (`__`) separate nested keys, while a single
+underscore (`_`) is replaced with a dash (`-`).

 For example:

@@ -193,21 +264,21 @@ For example:
 - `MDBOOK_FOO_BAR` -> `foo-bar`
 - `MDBOOK_FOO_bar__baz` -> `foo-bar.baz`

-So by setting the `MDBOOK_BOOK__TITLE` environment variable you can
-override the book's title without needing to touch your `book.toml`.
+So by setting the `MDBOOK_BOOK__TITLE` environment variable you can override the
+book's title without needing to touch your `book.toml`.

-> **Note:** To facilitate setting more complex config items, the value
-> of an environment variable is first parsed as JSON, falling back to a
-> string if the parse fails.
+> **Note:** To facilitate setting more complex config items, the value of an
+> environment variable is first parsed as JSON, falling back to a string if the
+> parse fails.
 >
-> This means, if you so desired, you could override all book metadata
-> when building the book with something like
+> This means, if you so desired, you could override all book metadata when
+> building the book with something like
 >
 > ```text
 > $ export MDBOOK_BOOK="{'title': 'My Awesome Book', authors: ['Michael-F-Bryan']}"
 > $ mdbook build
 > ```

-The latter case may be useful in situations where `mdbook` is invoked
-from a script or CI, where it sometimes isn't possible to update the
-`book.toml` before building.
+The latter case may be useful in situations where `mdbook` is invoked from a
+script or CI, where it sometimes isn't possible to update the `book.toml` before
+building.
--- a/book-example/src/format/mathjax.md
+++ b/book-example/src/format/mathjax.md
@@ -1,29 +1,37 @@
 # MathJax Support

-mdBook has optional support for math equations through [MathJax](https://www.mathjax.org/).
+mdBook has optional support for math equations through
+[MathJax](https://www.mathjax.org/).

-To enable MathJax, you need to add the `mathjax-support` key to your `book.toml` under the `output.html` section.
+To enable MathJax, you need to add the `mathjax-support` key to your `book.toml`
+under the `output.html` section.

 ```toml
 [output.html]
 mathjax-support = true
 ```

->**Note:**
-The usual delimiters MathJax uses are not yet supported. You can't currently use `$$ ... $$` as delimiters and the `\[ ... \]` delimiters need an extra backslash to work. Hopefully this limitation will be lifted soon.
+>**Note:** The usual delimiters MathJax uses are not yet supported. You can't
+currently use `$$ ... $$` as delimiters and the `\[ ... \]` delimiters need an
+extra backslash to work. Hopefully this limitation will be lifted soon.

->**Note:**
-> When you use double backslashes in MathJax blocks (for example in commands such as `\begin{cases} \frac 1 2 \\ \frac 3 4 \end{cases}`) you need to add _two extra_ backslashes (e.g., `\begin{cases} \frac 1 2 \\\\ \frac 3 4 \end{cases}`).
+>**Note:** When you use double backslashes in MathJax blocks (for example in
+> commands such as `\begin{cases} \frac 1 2 \\ \frac 3 4 \end{cases}`) you need
+> to add _two extra_ backslashes (e.g., `\begin{cases} \frac 1 2 \\\\ \frac 3 4
+> \end{cases}`).


 ### Inline equations
-Inline equations are delimited by `\\(` and `\\)`. So for example, to render the following inline equation \\( \int x dx = \frac{x^2}{2} + C \\) you would write the following:
+Inline equations are delimited by `\\(` and `\\)`. So for example, to render the
+following inline equation \\( \int x dx = \frac{x^2}{2} + C \\) you would write
+the following:
 ```
 \\( \int x dx = \frac{x^2}{2} + C \\)
 ```

 ### Block equations
-Block equations are delimited by `\\[` and `\\]`. To render the following equation
+Block equations are delimited by `\\[` and `\\]`. To render the following
+equation

 \\[ \mu = \frac{1}{N} \sum_{i=0} x_i \\]

--- a/book-example/src/format/mdbook.md
+++ b/book-example/src/format/mdbook.md
@@ -2,7 +2,8 @@

 ## Hiding code lines

-There is a feature in mdBook that lets you hide code lines by prepending them with a `#`.
+There is a feature in mdBook that lets you hide code lines by prepending them
+with a `#`.

 ```bash
 # fn main() {
@@ -34,7 +35,10 @@ With the following syntax, you can include files into your book:

 The path to the file has to be relative from the current source file.

-Usually, this command is used for including code snippets and examples. In this case, oftens one would include a specific part of the file e.g. which only contains the relevant lines for the example. We support four different modes of partial includes:
+Usually, this command is used for including code snippets and examples. In this
+case, oftens one would include a specific part of the file e.g. which only
+contains the relevant lines for the example. We support four different modes of
+partial includes:

 ```hbs
 \{{#include file.rs:2}}
@@ -43,7 +47,11 @@ Usually, this command is used for including code snippets and examples. In this
 \{{#include file.rs:2:10}}
 ```

-The first command only includes the second line from file `file.rs`. The second command includes all lines up to line 10, i.e. the lines from 11 till the end of the file are omitted. The third command includes all lines from line 2, i.e. the first line is omitted. The last command includes the excerpt of `file.rs` consisting of lines 2 to 10.
+The first command only includes the second line from file `file.rs`. The second
+command includes all lines up to line 10, i.e. the lines from 11 till the end of
+the file are omitted. The third command includes all lines from line 2, i.e. the
+first line is omitted. The last command includes the excerpt of `file.rs`
+consisting of lines 2 to 10.

 ## Inserting runnable Rust files

@@ -55,7 +63,9 @@ With the following syntax, you can insert runnable Rust files into your book:

 The path to the Rust file has to be relative from the current source file.

-When play is clicked, the code snippet will be sent to the [Rust Playpen] to be compiled and run. The result is sent back and displayed directly underneath the code.
+When play is clicked, the code snippet will be sent to the [Rust Playpen] to be
+compiled and run. The result is sent back and displayed directly underneath the
+code.

 Here is what a rendered code snippet looks like:

--- a/book-example/src/format/summary.md
+++ b/book-example/src/format/summary.md
@@ -1,32 +1,38 @@
 # SUMMARY.md

-The summary file is used by mdBook to know what chapters to include,
-in what order they should appear, what their hierarchy is and where the source files are.
-Without this file, there is no book.
+The summary file is used by mdBook to know what chapters to include, in what
+order they should appear, what their hierarchy is and where the source files
+are. Without this file, there is no book.

 Even though `SUMMARY.md` is a markdown file, the formatting is very strict to
 allow for easy parsing. Let's see how you should format your `SUMMARY.md` file.

 #### Allowed elements

-1. ***Title*** It's common practice to begin with a title, generally
-   <code class="language-markdown"># Summary</code>.
-   But it is not mandatory, the parser just ignores it. So you can too
-   if you feel like it.
+1. ***Title*** It's common practice to begin with a title, generally <code
+   class="language-markdown"># Summary</code>. But it is not mandatory, the
+   parser just ignores it. So you can too if you feel like it.

-2. ***Prefix Chapter*** Before the main numbered chapters you can add a couple of elements that will not be numbered. This is useful for
-   forewords, introductions, etc. There are however some constraints. You can not nest prefix chapters, they should all be on the root level. And you can not add prefix chapters once you have added numbered chapters.
+2. ***Prefix Chapter*** Before the main numbered chapters you can add a couple
+   of elements that will not be numbered. This is useful for forewords,
+   introductions, etc. There are however some constraints. You can not nest
+   prefix chapters, they should all be on the root level. And you can not add
+   prefix chapters once you have added numbered chapters.
   ```markdown
   [Title of prefix element](relative/path/to/markdown.md)
   ```

-3. ***Numbered Chapter*** Numbered chapters are the main content of the book, they will be numbered and can be nested,
-   resulting in a nice hierarchy (chapters, sub-chapters, etc.)
+3. ***Numbered Chapter*** Numbered chapters are the main content of the book,
+   they will be numbered and can be nested, resulting in a nice hierarchy
+   (chapters, sub-chapters, etc.)
   ```markdown
   - [Title of the Chapter](relative/path/to/markdown.md)
   ```
   You can either use `-` or `*` to indicate a numbered chapter.

-4. ***Suffix Chapter*** After the numbered chapters you can add a couple of non-numbered chapters. They are the same as prefix chapters but come after the numbered chapters instead of before.
+4. ***Suffix Chapter*** After the numbered chapters you can add a couple of
+   non-numbered chapters. They are the same as prefix chapters but come after
+   the numbered chapters instead of before.

-All other elements are unsupported and will be ignored at best or result in an error.
+All other elements are unsupported and will be ignored at best or result in an
+error.
--- a/book-example/src/format/theme/README.md
+++ b/book-example/src/format/theme/README.md
@@ -1,22 +1,34 @@
 # Theme

-The default renderer uses a [handlebars](http://handlebarsjs.com/) template to render your markdown files and comes with a default theme
-included in the mdBook binary.
+The default renderer uses a [handlebars](http://handlebarsjs.com/) template to
+render your markdown files and comes with a default theme included in the mdBook
+binary.

-The theme is totally customizable, you can selectively replace every file from the theme by your own by adding a
-`theme` directory next to `src` folder in your project root. Create a new file with the name of the file you want to override
+The theme is totally customizable, you can selectively replace every file from
+the theme by your own by adding a `theme` directory next to `src` folder in your
+project root. Create a new file with the name of the file you want to override
 and now that file will be used instead of the default file.

 Here are the files you can override:

 - ***index.hbs*** is the handlebars template.
- ***book.css*** is the style used in the output. If you want to change the design of your book, this is probably the file you want to modify. Sometimes in conjunction with `index.hbs` when you want to radically change the layout.
- ***book.js*** is mostly used to add client side functionality, like hiding / un-hiding the sidebar, changing the theme, ...
- ***highlight.js*** is the JavaScript that is used to highlight code snippets, you should not need to modify this.  
+- ***book.css*** is the style used in the output. If you want to change the
+  design of your book, this is probably the file you want to modify. Sometimes
+  in conjunction with `index.hbs` when you want to radically change the layout.
+- ***book.js*** is mostly used to add client side functionality, like hiding /
+  un-hiding the sidebar, changing the theme, ...
+- ***highlight.js*** is the JavaScript that is used to highlight code snippets,
+  you should not need to modify this.  
 - ***highlight.css*** is the theme used for the code highlighting
 - ***favicon.png*** the favicon that will be used

-Generally, when you want to tweak the theme, you don't need to override all the files. If you only need changes in the stylesheet,
-there is no point in overriding all the other files. Because custom files take precedence over built-in ones, they will not get updated with new fixes / features.
+Generally, when you want to tweak the theme, you don't need to override all the
+files. If you only need changes in the stylesheet, there is no point in
+overriding all the other files. Because custom files take precedence over
+built-in ones, they will not get updated with new fixes / features.

-**Note:** When you override a file, it is possible that you break some functionality. Therefore I recommend to use the file from the default theme as template and only add / modify what you need. You can copy the default theme into your source directory automatically by using `mdbook init --theme` just remove the files you don't want to override.
+**Note:** When you override a file, it is possible that you break some
+functionality. Therefore I recommend to use the file from the default theme as
+template and only add / modify what you need. You can copy the default theme
+into your source directory automatically by using `mdbook init --theme` just
+remove the files you don't want to override.
--- a/book-example/src/format/theme/editor.md
+++ b/book-example/src/format/theme/editor.md
@@ -1,13 +1,16 @@
 # Editor

-In addition to providing runnable code playpens, mdBook optionally allows them to be editable. In order to enable editable code blocks, the following needs to be added to the ***book.toml***:
+In addition to providing runnable code playpens, mdBook optionally allows them
+to be editable. In order to enable editable code blocks, the following needs to
+be added to the ***book.toml***:

 ```toml
 [output.html.playpen]
 editable = true
 ```

-To make a specific block available for editing, the attribute `editable` needs to be added to it:
+To make a specific block available for editing, the attribute `editable` needs
+to be added to it:

 <pre><code class="language-markdown">```rust,editable
 fn main() {
@@ -29,7 +32,8 @@ Note the new `Undo Changes` button in the editable playpens.

 ## Customizing the Editor

-By default, the editor is the [Ace](https://ace.c9.io/) editor, but, if desired, the functionality may be overriden by providing a different folder:
+By default, the editor is the [Ace](https://ace.c9.io/) editor, but, if desired,
+the functionality may be overriden by providing a different folder:

 ```toml
 [output.html.playpen]
@@ -37,4 +41,6 @@ editable = true
 editor = "/path/to/editor"
 ```

-Note that for the editor changes to function correctly, the `book.js` inside of the `theme` folder will need to be overriden as it has some couplings with the default Ace editor.
+Note that for the editor changes to function correctly, the `book.js` inside of
+the `theme` folder will need to be overriden as it has some couplings with the
+default Ace editor.
--- a/book-example/src/format/theme/index-hbs.md
+++ b/book-example/src/format/theme/index-hbs.md
@@ -1,15 +1,15 @@
 # index.hbs

-`index.hbs` is the handlebars template that is used to render the book.
-The markdown files are processed to html and then injected in that template.
+`index.hbs` is the handlebars template that is used to render the book. The
+markdown files are processed to html and then injected in that template.

-If you want to change the layout or style of your book, chances are that you will
-have to modify this template a little bit. Here is what you need to know.
+If you want to change the layout or style of your book, chances are that you
+will have to modify this template a little bit. Here is what you need to know.

 ## Data

-A lot of data is exposed to the handlebars template with the "context".
-In the handlebars template you can access this information by using
+A lot of data is exposed to the handlebars template with the "context". In the
+handlebars template you can access this information by using

 ```handlebars
 {{name_of_property}}
@@ -17,27 +17,33 @@ In the handlebars template you can access this information by using

 Here is a list of the properties that are exposed:

- ***language*** Language of the book in the form `en`. To use in <code class="language-html">\<html lang="{{ language }}"></code> for example.
-At the moment it is hardcoded.
+- ***language*** Language of the book in the form `en`. To use in <code
+  class="language-html">\<html lang="{{ language }}"></code> for example. At the
+  moment it is hardcoded.
 - ***title*** Title of the book, as specified in `book.toml`
 - ***chapter_title*** Title of the current chapter, as listed in `SUMMARY.md`

- ***path*** Relative path to the original markdown file from the source directory
+- ***path*** Relative path to the original markdown file from the source
+  directory
 - ***content*** This is the rendered markdown.
- ***path_to_root*** This is a path containing exclusively `../`'s that points to the root of the book from the current file.
-Since the original directory structure is maintained, it is useful to prepend relative links with this `path_to_root`.
+- ***path_to_root*** This is a path containing exclusively `../`'s that points
+  to the root of the book from the current file. Since the original directory
+  structure is maintained, it is useful to prepend relative links with this
+  `path_to_root`.

 - ***chapters*** Is an array of dictionaries of the form
  ```json
  {"section": "1.2.1", "name": "name of this chapter", "path": "dir/markdown.md"}
  ```
-  containing all the chapters of the book. It is used for example to construct the table of contents (sidebar).
+  containing all the chapters of the book. It is used for example to construct
+  the table of contents (sidebar).

 ## Handlebars Helpers

-In addition to the properties you can access, there are some handlebars helpers at your disposal.
+In addition to the properties you can access, there are some handlebars helpers
+at your disposal.

-1.  ### toc
+### 1. toc

    The toc helper is used like this

@@ -68,7 +74,7 @@ In addition to the properties you can access, there are some handlebars helpers
    </script>
    ```

-2.  ### previous / next
+### 2. previous / next

    The previous and next helpers expose a `link` and `name` property to the previous and next chapters.

@@ -87,5 +93,5 @@ In addition to the properties you can access, there are some handlebars helpers

 ------

-*If you would like me to expose other properties or helpers, please [create a new issue](https://github.com/rust-lang-nursery/mdBook/issues)
-and I will consider it.*
+*If you would like other properties or helpers exposed, please [create a new
+issue](https://github.com/rust-lang-nursery/mdBook/issues)*
--- a/book-example/src/format/theme/syntax-highlighting.md
+++ b/book-example/src/format/theme/syntax-highlighting.md
@@ -1,6 +1,7 @@
 # Syntax Highlighting

-For syntax highlighting I use [Highlight.js](https://highlightjs.org) with a custom theme.
+For syntax highlighting I use [Highlight.js](https://highlightjs.org) with a
+custom theme.

 Automatic language detection has been turned off, so you will probably want to
 specify the programming language you use like this
@@ -12,19 +13,23 @@ fn main() {
 ```</code></pre>

 ## Custom theme
-Like the rest of the theme, the files used for syntax highlighting can be overridden with your own.
+Like the rest of the theme, the files used for syntax highlighting can be
+overridden with your own.

- ***highlight.js*** normally you shouldn't have to overwrite this file, unless you want to use a more recent version.
+- ***highlight.js*** normally you shouldn't have to overwrite this file, unless
+  you want to use a more recent version.
 - ***highlight.css*** theme used by highlight.js for syntax highlighting.

-If you want to use another theme for `highlight.js` download it from their website, or make it yourself,
-rename it to `highlight.css` and put it in `src/theme` (or the equivalent if you changed your source folder)
+If you want to use another theme for `highlight.js` download it from their
+website, or make it yourself, rename it to `highlight.css` and put it in
+`src/theme` (or the equivalent if you changed your source folder)

 Now your theme will be used instead of the default theme.

 ## Hiding code lines

-There is a feature in mdBook that let's you hide code lines by prepending them with a `#`.
+There is a feature in mdBook that lets you hide code lines by prepending them
+with a `#`.


 ```bash
@@ -47,13 +52,18 @@ Will render as
 # }
 ```

-**At the moment, this only works for code examples that are annotated with `rust`. Because it would collide with semantics of some programming languages. In the future, we want to make this configurable through the `book.toml` so that everyone can benefit from it.**
+**At the moment, this only works for code examples that are annotated with
+`rust`. Because it would collide with semantics of some programming languages.
+In the future, we want to make this configurable through the `book.toml` so that
+everyone can benefit from it.**


 ## Improve default theme

-If you think the default theme doesn't look quite right for a specific language, or could be improved.
-Feel free to [submit a new issue](https://github.com/rust-lang-nursery/mdBook/issues) explaining what you have in mind and I will take a look at it.
+If you think the default theme doesn't look quite right for a specific language,
+or could be improved. Feel free to [submit a new
+issue](https://github.com/rust-lang-nursery/mdBook/issues) explaining what you
+have in mind and I will take a look at it.

 You could also create a pull-request with the proposed improvements.

--- a/book-example/src/misc/contributors.md
+++ b/book-example/src/misc/contributors.md
@@ -1,8 +1,7 @@
 # Contributors

-Here is a list of the contributors who have helped improving mdBook. Big shout-out to them!
-
-If you have contributed to mdBook and I forgot to add you, don't hesitate to add yourself to the list. If you are in the list, feel free to add your real name & contact information if you wish.
+Here is a list of the contributors who have helped improving mdBook. Big
+shout-out to them!

 - [mdinger](https://github.com/mdinger)
 - Kevin ([kbknapp](https://github.com/kbknapp))
@@ -12,8 +11,10 @@ If you have contributed to mdBook and I forgot to add you, don't hesitate to add
 - [funnkill](https://github.com/funkill)
 - Fu Gangqiang ([FuGangqiang](https://github.com/FuGangqiang))
 - [Michael-F-Bryan](https://github.com/Michael-F-Bryan)
- [Chris Spiegel](https://github.com/cspiegel)
+- Chris Spiegel ([cspiegel](https://github.com/cspiegel))
 - [projektir](https://github.com/projektir)
 - [Phaiax](https://github.com/Phaiax)
- [Matt Ickstadt](https://github.com/mattico)
+- Matt Ickstadt ([mattico](https://github.com/mattico))
 - Weihang Lo ([@weihanglo](https://github.com/weihanglo))
+
+If you feel you're missing from this list, feel free to add yourself in a PR.
--- a/ci/github_pages.sh
+++ b/ci/github_pages.sh
@@ -1,47 +0,0 @@
-#!/bin/bash
-# Deploys the `book-example` to GitHub Pages
-
-set -ex
-
-# Only run this on the master branch for stable
-if [ "$TRAVIS_PULL_REQUEST" != "false" ] || 
-   [ "$TRAVIS_BRANCH" != "master" ] ||
-   [ "$TRAVIS_RUST_VERSION" != "stable" ] ||
-   [ "$TARGET" != "x86_64-unknown-linux-gnu" ]; then
-   exit 0
-fi
-
-NC='\033[39m'
-CYAN='\033[36m'
-GREEN='\033[32m'
-
-rev=$(git rev-parse --short HEAD)
-
-echo -e "${CYAN}Running cargo doc${NC}"
-cargo doc > /dev/null
-
-echo -e "${CYAN}Running mdbook build${NC}"
-cargo run -- build book-example/
-
-echo -e "${CYAN}Copying book to target/doc${NC}"
-cp -R book-example/book/* target/doc/
-
-cd target/doc
-
-echo -e "${CYAN}Initializing Git${NC}"
-git init
-git config user.name "Michael Bryan"
-git config user.email "michaelfbryan@gmail.com"
-
-git remote add upstream "https://$GH_TOKEN@github.com/rust-lang-nursery/mdBook.git"
-git fetch upstream --quiet
-git reset upstream/gh-pages --quiet
-
-touch .
-
-echo -e "${CYAN}Pushing changes to gh-pages${NC}"
-git add -A . 
-git commit -m "rebuild pages at ${rev}" --quiet
-git push -q upstream HEAD:gh-pages --quiet
-
-echo -e "${GREEN}Deployed docs to GitHub Pages${NC}"
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,47 +0,0 @@
-set -ex
-
-main() {
-    local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
-        target=x86_64-unknown-linux-musl
-        sort=sort
-    else
-        target=x86_64-apple-darwin
-        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
-    fi
-
-    # Builds for iOS are done on OSX, but require the specific target to be
-    # installed.
-    case $TARGET in
-        aarch64-apple-ios)
-            rustup target install aarch64-apple-ios
-            ;;
-        armv7-apple-ios)
-            rustup target install armv7-apple-ios
-            ;;
-        armv7s-apple-ios)
-            rustup target install armv7s-apple-ios
-            ;;
-        i386-apple-ios)
-            rustup target install i386-apple-ios
-            ;;
-        x86_64-apple-ios)
-            rustup target install x86_64-apple-ios
-            ;;
-    esac
-
-    # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
-                       | tail -n1)
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/cross \
-           --tag $tag \
-           --target $target
-}
-
-main
--- a/examples/de-emphasize.rs
+++ b/examples/de-emphasize.rs
@@ -1,4 +1,6 @@
-//! This program removes all forms of emphasis from the markdown of the book.
+//! An example preprocessor for removing all forms of emphasis from a markdown
+//! book.
+
 extern crate mdbook;
 extern crate pulldown_cmark;
 extern crate pulldown_cmark_to_cmark;
@@ -6,89 +8,75 @@ extern crate pulldown_cmark_to_cmark;
 use mdbook::book::{Book, BookItem, Chapter};
 use mdbook::errors::{Error, Result};
 use mdbook::preprocess::{Preprocessor, PreprocessorContext};
-use mdbook::MDBook;
 use pulldown_cmark::{Event, Parser, Tag};
 use pulldown_cmark_to_cmark::fmt::cmark;

-use std::env::{args, args_os};
-use std::ffi::OsString;
-use std::process;
+const NAME: &str = "md-links-to-html-links";
+
+fn main() {
+    panic!("This example is intended to be part of a library");
+}

 struct Deemphasize;

 impl Preprocessor for Deemphasize {
    fn name(&self) -> &str {
-        "md-links-to-html-links"
+        NAME
    }

-    fn run(&self, _ctx: &PreprocessorContext, book: &mut Book) -> Result<()> {
+    fn run(&self, _ctx: &PreprocessorContext, mut book: Book) -> Result<Book> {
        eprintln!("Running '{}' preprocessor", self.name());
-        let mut res: Option<_> = None;
        let mut num_removed_items = 0;
-        book.for_each_mut(|item: &mut BookItem| {
-            if let Some(Err(_)) = res {
-                return;
-            }
-            if let BookItem::Chapter(ref mut chapter) = *item {
-                eprintln!("{}: processing chapter '{}'", self.name(), chapter.name);
-                res = Some(
-                    match Deemphasize::remove_emphasis(&mut num_removed_items, chapter) {
-                        Ok(md) => {
-                            chapter.content = md;
-                            Ok(())
-                        }
-                        Err(err) => Err(err),
-                    },
-                );
-            }
-        });
+
+        process(&mut book.sections, &mut num_removed_items)?;
+
        eprintln!(
            "{}: removed {} events from markdown stream.",
            self.name(),
            num_removed_items
        );
-        match res {
-            Some(res) => res,
-            None => Ok(()),
+
+        Ok(book)
+    }
+}
+
+fn process<'a, I>(items: I, num_removed_items: &mut usize) -> Result<()>
+where
+    I: IntoIterator<Item = &'a mut BookItem> + 'a,
+{
+    for item in items {
+        if let BookItem::Chapter(ref mut chapter) = *item {
+            eprintln!("{}: processing chapter '{}'", NAME, chapter.name);
+
+            let md = remove_emphasis(num_removed_items, chapter)?;
+            chapter.content = md;
        }
    }
+
+    Ok(())
 }

-fn do_it(book: OsString) -> Result<()> {
-    let mut book = MDBook::load(book)?;
-    book.with_preprecessor(Deemphasize);
-    book.build()
-}
+fn remove_emphasis(
+    num_removed_items: &mut usize,
+    chapter: &mut Chapter,
+) -> Result<String> {
+    let mut buf = String::with_capacity(chapter.content.len());

-fn main() {
-    if args_os().count() != 2 {
-        eprintln!("USAGE: {} <book>", args().next().expect("executable"));
-        return;
-    }
-    if let Err(e) = do_it(args_os().skip(1).next().expect("one argument")) {
-        eprintln!("{}", e);
-        process::exit(1);
-    }
-}
+    let events = Parser::new(&chapter.content).filter(|e| {
+        let should_keep = match *e {
+            Event::Start(Tag::Emphasis)
+            | Event::Start(Tag::Strong)
+            | Event::End(Tag::Emphasis)
+            | Event::End(Tag::Strong) => false,
+            _ => true,
+        };
+        if !should_keep {
+            *num_removed_items += 1;
+        }
+        should_keep
+    });

-impl Deemphasize {
-    fn remove_emphasis(num_removed_items: &mut i32, chapter: &mut Chapter) -> Result<String> {
-        let mut buf = String::with_capacity(chapter.content.len());
-        let events = Parser::new(&chapter.content).filter(|e| {
-            let should_keep = match *e {
-                Event::Start(Tag::Emphasis)
-                | Event::Start(Tag::Strong)
-                | Event::End(Tag::Emphasis)
-                | Event::End(Tag::Strong) => false,
-                _ => true,
-            };
-            if !should_keep {
-                *num_removed_items += 1;
-            }
-            should_keep
-        });
-        cmark(events, &mut buf, None)
-            .map(|_| buf)
-            .map_err(|err| Error::from(format!("Markdown serialization failed: {}", err)))
-    }
+    cmark(events, &mut buf, None).map(|_| buf).map_err(|err| {
+        Error::from(format!("Markdown serialization failed: {}", err))
+    })
 }
--- a/examples/nop-preprocessor.rs
+++ b/examples/nop-preprocessor.rs
@@ -0,0 +1,112 @@
+extern crate clap;
+extern crate mdbook;
+extern crate serde_json;
+
+use clap::{App, Arg, ArgMatches, SubCommand};
+use mdbook::book::Book;
+use mdbook::errors::Error;
+use mdbook::preprocess::{CmdPreprocessor, Preprocessor, PreprocessorContext};
+use std::io;
+use std::process;
+use nop_lib::Nop;
+
+pub fn make_app() -> App<'static, 'static> {
+    App::new("nop-preprocessor")
+        .about("A mdbook preprocessor which does precisely nothing")
+        .subcommand(
+            SubCommand::with_name("supports")
+                .arg(Arg::with_name("renderer").required(true))
+                .about("Check whether a renderer is supported by this preprocessor"))
+}
+
+fn main() {
+    let matches = make_app().get_matches();
+
+    // Users will want to construct their own preprocessor here
+    let preprocessor = Nop::new();
+
+    if let Some(sub_args) = matches.subcommand_matches("supports") {
+        handle_supports(&preprocessor, sub_args);
+    } else {
+        if let Err(e) = handle_preprocessing(&preprocessor) {
+            eprintln!("{}", e);
+            process::exit(1);
+        }
+    }
+}
+
+fn handle_preprocessing(pre: &dyn Preprocessor) -> Result<(), Error> {
+    let (ctx, book) = CmdPreprocessor::parse_input(io::stdin())?;
+
+    if ctx.mdbook_version != mdbook::MDBOOK_VERSION {
+        // We should probably use the `semver` crate to check compatibility
+        // here...
+        eprintln!(
+            "Warning: The {} plugin was built against version {} of mdbook, \
+             but we're being called from version {}",
+            pre.name(),
+            mdbook::MDBOOK_VERSION,
+            ctx.mdbook_version
+        );
+    }
+
+    let processed_book = pre.run(&ctx, book)?;
+    serde_json::to_writer(io::stdout(), &processed_book)?;
+
+    Ok(())
+}
+
+fn handle_supports(pre: &dyn Preprocessor, sub_args: &ArgMatches) -> ! {
+    let renderer = sub_args.value_of("renderer").expect("Required argument");
+    let supported = pre.supports_renderer(&renderer);
+
+    // Signal whether the renderer is supported by exiting with 1 or 0.
+    if supported {
+        process::exit(0);
+    } else {
+        process::exit(1);
+    }
+}
+
+/// The actual implementation of the `Nop` preprocessor. This would usually go
+/// in your main `lib.rs` file.
+mod nop_lib {
+    use super::*;
+
+    /// A no-op preprocessor.
+    pub struct Nop;
+
+    impl Nop {
+        pub fn new() -> Nop {
+            Nop
+        }
+    }
+
+    impl Preprocessor for Nop {
+        fn name(&self) -> &str {
+            "nop-preprocessor"
+        }
+
+        fn run(
+            &self,
+            ctx: &PreprocessorContext,
+            book: Book,
+        ) -> Result<Book, Error> {
+            // In testing we want to tell the preprocessor to blow up by setting a
+            // particular config value
+            if let Some(nop_cfg) = ctx.config.get_preprocessor(self.name()) {
+                if nop_cfg.contains_key("blow-up") {
+                    return Err("Boom!!1!".into());
+                }
+            }
+
+            // we *are* a no-op preprocessor after all
+            Ok(book)
+        }
+
+        fn supports_renderer(&self, renderer: &str) -> bool {
+            renderer != "not-supported"
+        }
+    }
+}
+
--- a/src/book/book.rs
+++ b/src/book/book.rs
@@ -245,7 +245,8 @@ fn load_chapter<P: AsRef<Path>>(
    ch.number = link.number.clone();

    sub_item_parents.push(link.name.clone());
-    let sub_items = link.nested_items
+    let sub_items = link
+        .nested_items
        .iter()
        .map(|i| load_summary_item(i, src_dir, sub_item_parents.clone()))
        .collect::<Result<Vec<_>>>()?;
@@ -475,12 +476,12 @@ And here is some \
        assert_eq!(got.len(), 5);

        // checking the chapter names are in the order should be sufficient here...
-        let chapter_names: Vec<String> = got.into_iter()
+        let chapter_names: Vec<String> = got
+            .into_iter()
            .filter_map(|i| match *i {
                BookItem::Chapter(ref ch) => Some(ch.name.clone()),
                _ => None,
-            })
-            .collect();
+            }).collect();
        let should_be: Vec<_> = vec![
            String::from("Chapter 1"),
            String::from("Hello World"),
--- a/src/book/init.rs
+++ b/src/book/init.rs
@@ -110,7 +110,8 @@ impl BookBuilder {
    fn copy_across_theme(&self) -> Result<()> {
        debug!("Copying theme");

-        let themedir = self.config
+        let themedir = self
+            .config
            .html_config()
            .and_then(|html| html.theme)
            .unwrap_or_else(|| self.config.book.src.join("theme"));
--- a/src/book/mod.rs
+++ b/src/book/mod.rs
@@ -20,7 +20,8 @@ use tempfile::Builder as TempFileBuilder;
 use toml::Value;

 use errors::*;
-use preprocess::{IndexPreprocessor, LinkPreprocessor, Preprocessor, PreprocessorContext};
+use preprocess::{IndexPreprocessor, LinkPreprocessor, Preprocessor,
+    PreprocessorContext, CmdPreprocessor};
 use renderer::{CmdRenderer, HtmlHandlebars, RenderContext, Renderer};
 use utils;

@@ -149,23 +150,39 @@ impl MDBook {
    pub fn build(&self) -> Result<()> {
        info!("Book building has started");

-        let mut preprocessed_book = self.book.clone();
-        let preprocess_ctx = PreprocessorContext::new(self.root.clone(), self.config.clone());
-
-        for preprocessor in &self.preprocessors {
-            debug!("Running the {} preprocessor.", preprocessor.name());
-            preprocessor.run(&preprocess_ctx, &mut preprocessed_book)?;
-        }
-
        for renderer in &self.renderers {
-            info!("Running the {} backend", renderer.name());
-            self.run_renderer(&preprocessed_book, renderer.as_ref())?;
+            self.execute_build_process(&**renderer)?;
        }

        Ok(())
    }

-    fn run_renderer(&self, preprocessed_book: &Book, renderer: &Renderer) -> Result<()> {
+    /// Run the entire build process for a particular `Renderer`.
+    fn execute_build_process(&self, renderer: &Renderer) -> Result<()> {
+        let mut preprocessed_book = self.book.clone();
+        let preprocess_ctx = PreprocessorContext::new(self.root.clone(),
+                                     self.config.clone(),
+                                     renderer.name().to_string());
+
+        for preprocessor in &self.preprocessors {
+            if preprocessor_should_run(&**preprocessor, renderer, &self.config) {
+                debug!("Running the {} preprocessor.", preprocessor.name());
+                preprocessed_book =
+                    preprocessor.run(&preprocess_ctx, preprocessed_book)?;
+            }
+        }
+
+        info!("Running the {} backend", renderer.name());
+        self.render(&preprocessed_book, renderer)?;
+
+        Ok(())
+    }
+
+    fn render(
+        &self,
+        preprocessed_book: &Book,
+        renderer: &Renderer,
+    ) -> Result<()> {
        let name = renderer.name();
        let build_dir = self.build_dir_for(name);
        if build_dir.exists() {
@@ -215,13 +232,16 @@ impl MDBook {

        let temp_dir = TempFileBuilder::new().prefix("mdbook-").tempdir()?;

-        let preprocess_context = PreprocessorContext::new(self.root.clone(), self.config.clone());
+        // FIXME: Is "test" the proper renderer name to use here?
+        let preprocess_context = PreprocessorContext::new(self.root.clone(),
+                                                          self.config.clone(),
+                                                          "test".to_string());

-        LinkPreprocessor::new().run(&preprocess_context, &mut self.book)?;
+        let book = LinkPreprocessor::new().run(&preprocess_context, self.book.clone())?;
        // Index Preprocessor is disabled so that chapter paths continue to point to the
        // actual markdown files.

-        for item in self.iter() {
+        for item in book.iter() {
            if let BookItem::Chapter(ref ch) = *item {
                if !ch.path.as_os_str().is_empty() {
                    let path = self.source_dir().join(&ch.path);
@@ -330,30 +350,55 @@ fn default_preprocessors() -> Vec<Box<Preprocessor>> {
    ]
 }

+fn is_default_preprocessor(pre: &Preprocessor) -> bool {
+    let name = pre.name();
+    name == LinkPreprocessor::NAME || name == IndexPreprocessor::NAME
+}
+
 /// Look at the `MDBook` and try to figure out what preprocessors to run.
 fn determine_preprocessors(config: &Config) -> Result<Vec<Box<Preprocessor>>> {
-    let preprocess_list = match config.build.preprocess {
-        Some(ref p) => p,
-        // If no preprocessor field is set, default to the LinkPreprocessor and
-        // IndexPreprocessor. This allows you to disable default preprocessors
-        // by setting "preprocess" to an empty list.
-        None => return Ok(default_preprocessors()),
-    };
+    let mut preprocessors = Vec::new();

-    let mut preprocessors: Vec<Box<Preprocessor>> = Vec::new();
+    if config.build.use_default_preprocessors {
+        preprocessors.extend(default_preprocessors());
+    }

-    for key in preprocess_list {
-        match key.as_ref() {
-            "links" => preprocessors.push(Box::new(LinkPreprocessor::new())),
-            "index" => preprocessors.push(Box::new(IndexPreprocessor::new())),
-            _ => bail!("{:?} is not a recognised preprocessor", key),
+    if let Some(preprocessor_table) =
+        config.get("preprocessor").and_then(|v| v.as_table())
+    {
+        for key in preprocessor_table.keys() {
+            match key.as_ref() {
+                "links" => {
+                    preprocessors.push(Box::new(LinkPreprocessor::new()))
+                }
+                "index" => {
+                    preprocessors.push(Box::new(IndexPreprocessor::new()))
+                }
+                name => preprocessors.push(interpret_custom_preprocessor(
+                    name,
+                    &preprocessor_table[name],
+                )),
+            }
        }
    }

    Ok(preprocessors)
 }

-fn interpret_custom_renderer(key: &str, table: &Value) -> Box<Renderer> {
+fn interpret_custom_preprocessor(
+    key: &str,
+    table: &Value,
+) -> Box<CmdPreprocessor> {
+    let command = table
+        .get("command")
+        .and_then(|c| c.as_str())
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| format!("mdbook-{}", key));
+
+    Box::new(CmdPreprocessor::new(key.to_string(), command.to_string()))
+}
+
+fn interpret_custom_renderer(key: &str, table: &Value) -> Box<CmdRenderer> {
    // look for the `command` field, falling back to using the key
    // prepended by "mdbook-"
    let table_dot_command = table
@@ -361,11 +406,37 @@ fn interpret_custom_renderer(key: &str, table: &Value) -> Box<Renderer> {
        .and_then(|c| c.as_str())
        .map(|s| s.to_string());

-    let command = table_dot_command.unwrap_or_else(|| format!("mdbook-{}", key));
+    let command =
+        table_dot_command.unwrap_or_else(|| format!("mdbook-{}", key));

    Box::new(CmdRenderer::new(key.to_string(), command.to_string()))
 }

+/// Check whether we should run a particular `Preprocessor` in combination
+/// with the renderer, falling back to `Preprocessor::supports_renderer()`
+/// method if the user doesn't say anything.
+///
+/// The `build.use-default-preprocessors` config option can be used to ensure
+/// default preprocessors always run if they support the renderer.
+fn preprocessor_should_run(preprocessor: &Preprocessor, renderer: &Renderer, cfg: &Config) -> bool {
+    // default preprocessors should be run by default (if supported)
+    if cfg.build.use_default_preprocessors && is_default_preprocessor(preprocessor) {
+        return preprocessor.supports_renderer(renderer.name());
+    }
+
+    let key = format!("preprocessor.{}.renderers", preprocessor.name());
+    let renderer_name = renderer.name();
+
+    if let Some(Value::Array(ref explicit_renderers)) = cfg.get(&key) {
+        return explicit_renderers.into_iter()
+            .filter_map(|val| val.as_str())
+            .any(|name| name == renderer_name);
+    }
+
+    preprocessor.supports_renderer(renderer_name)
+}
+
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -413,8 +484,8 @@ mod tests {
    fn config_defaults_to_link_and_index_preprocessor_if_not_set() {
        let cfg = Config::default();

-        // make sure we haven't got anything in the `output` table
-        assert!(cfg.build.preprocess.is_none());
+        // make sure we haven't got anything in the `preprocessor` table
+        assert!(cfg.get("preprocessor").is_none());

        let got = determine_preprocessors(&cfg);

@@ -425,47 +496,107 @@ mod tests {
    }

    #[test]
-    fn config_doesnt_default_if_empty() {
-        let cfg_str: &'static str = r#"
-        [book]
-        title = "Some Book"
+    fn use_default_preprocessors_works() {
+        let mut cfg = Config::default();
+        cfg.build.use_default_preprocessors = false;

-        [build]
-        build-dir = "outputs"
-        create-missing = false
-        preprocess = []
-        "#;
+        let got = determine_preprocessors(&cfg).unwrap();

-        let cfg = Config::from_str(cfg_str).unwrap();
-
-        // make sure we have something in the `output` table
-        assert!(cfg.build.preprocess.is_some());
-
-        let got = determine_preprocessors(&cfg);
-
-        assert!(got.is_ok());
-        assert!(got.unwrap().is_empty());
+        assert_eq!(got.len(), 0);
    }

    #[test]
-    fn config_complains_if_unimplemented_preprocessor() {
+    fn can_determine_third_party_preprocessors() {
        let cfg_str: &'static str = r#"
        [book]
        title = "Some Book"

+        [preprocessor.random]
+
        [build]
        build-dir = "outputs"
        create-missing = false
-        preprocess = ["random"]
        "#;

        let cfg = Config::from_str(cfg_str).unwrap();

-        // make sure we have something in the `output` table
-        assert!(cfg.build.preprocess.is_some());
+        // make sure the `preprocessor.random` table exists
+        assert!(cfg.get_preprocessor("random").is_some());

-        let got = determine_preprocessors(&cfg);
+        let got = determine_preprocessors(&cfg).unwrap();

-        assert!(got.is_err());
+        assert!(got.into_iter().any(|p| p.name() == "random"));
+    }
+
+    #[test]
+    fn preprocessors_can_provide_their_own_commands() {
+        let cfg_str = r#"
+        [preprocessor.random]
+        command = "python random.py"
+        "#;
+
+        let cfg = Config::from_str(cfg_str).unwrap();
+
+        // make sure the `preprocessor.random` table exists
+        let random = cfg.get_preprocessor("random").unwrap();
+        let random = interpret_custom_preprocessor(
+            "random",
+            &Value::Table(random.clone()),
+        );
+
+        assert_eq!(random.cmd(), "python random.py");
+    }
+
+    #[test]
+    fn config_respects_preprocessor_selection() {
+        let cfg_str: &'static str = r#"
+        [preprocessor.links]
+        renderers = ["html"]
+        "#;
+
+        let cfg = Config::from_str(cfg_str).unwrap();
+
+        // double-check that we can access preprocessor.links.renderers[0]
+        let html = cfg.get_preprocessor("links")
+            .and_then(|links| links.get("renderers"))
+            .and_then(|renderers| renderers.as_array())
+            .and_then(|renderers| renderers.get(0))
+            .and_then(|renderer| renderer.as_str())
+            .unwrap();
+        assert_eq!(html, "html");
+        let html_renderer = HtmlHandlebars::default();
+        let pre = LinkPreprocessor::new();
+
+        let should_run = preprocessor_should_run(&pre, &html_renderer, &cfg);
+        assert!(should_run);
+    }
+
+    struct BoolPreprocessor(bool);
+    impl Preprocessor for BoolPreprocessor {
+        fn name(&self) -> &str {
+            "bool-preprocessor"
+        }
+
+        fn run(&self, _ctx: &PreprocessorContext, _book: Book) -> Result<Book> {
+            unimplemented!()
+        }
+
+        fn supports_renderer(&self, _renderer: &str) -> bool {
+            self.0
+        }
+    }
+
+    #[test]
+    fn preprocessor_should_run_falls_back_to_supports_renderer_method() {
+        let cfg = Config::default();
+        let html = HtmlHandlebars::new();
+
+        let should_be = true;
+        let got = preprocessor_should_run(&BoolPreprocessor(should_be), &html, &cfg);
+        assert_eq!(got, should_be);
+
+        let should_be = false;
+        let got = preprocessor_should_run(&BoolPreprocessor(should_be), &html, &cfg);
+        assert_eq!(got, should_be);
    }
 }
--- a/src/book/summary.rs
+++ b/src/book/summary.rs
@@ -221,11 +221,14 @@ impl<'a> SummaryParser<'a> {
    fn parse(mut self) -> Result<Summary> {
        let title = self.parse_title();

-        let prefix_chapters = self.parse_affix(true)
+        let prefix_chapters = self
+            .parse_affix(true)
            .chain_err(|| "There was an error parsing the prefix chapters")?;
-        let numbered_chapters = self.parse_numbered()
+        let numbered_chapters = self
+            .parse_numbered()
            .chain_err(|| "There was an error parsing the numbered chapters")?;
-        let suffix_chapters = self.parse_affix(false)
+        let suffix_chapters = self
+            .parse_affix(false)
            .chain_err(|| "There was an error parsing the suffix chapters")?;

        Ok(Summary {
@@ -289,6 +292,7 @@ impl<'a> SummaryParser<'a> {
    /// already been consumed by a previous parser.
    fn parse_numbered(&mut self) -> Result<Vec<SummaryItem>> {
        let mut items = Vec::new();
+        let mut root_items = 0;
        let root_number = SectionNumber::default();

        // we need to do this funny loop-match-if-let dance because a rule will
@@ -305,9 +309,11 @@ impl<'a> SummaryParser<'a> {
            // if we've resumed after something like a rule the root sections
            // will be numbered from 1. We need to manually go back and update
            // them
-            update_section_numbers(&mut bunch_of_items, 0, items.len() as u32);
+            update_section_numbers(&mut bunch_of_items, 0, root_items);
+            root_items += bunch_of_items.len() as u32;
            items.extend(bunch_of_items);

+
            match self.next_event() {
                Some(Event::Start(Tag::Paragraph)) => {
                    // we're starting the suffix chapters
@@ -472,8 +478,7 @@ fn stringify_events(events: Vec<Event>) -> String {
        .filter_map(|t| match t {
            Event::Text(text) => Some(text.into_owned()),
            _ => None,
-        })
-        .collect()
+        }).collect()
 }

 /// A section number like "1.2.3", basically just a newtype'd `Vec<u32>` with
@@ -722,4 +727,40 @@ mod tests {
        let got = parser.parse_numbered();
        assert!(got.is_err());
    }
+
+    /// Regression test for https://github.com/rust-lang-nursery/mdBook/issues/779
+    /// Ensure section numbers are correctly incremented after a horizontal separator.
+    #[test]
+    fn keep_numbering_after_separator() {
+        let src = "- [First](./first.md)\n---\n- [Second](./second.md)\n---\n- [Third](./third.md)\n";
+        let should_be = vec![
+            SummaryItem::Link(Link {
+                name: String::from("First"),
+                location: PathBuf::from("./first.md"),
+                number: Some(SectionNumber(vec![1])),
+                nested_items: Vec::new(),
+            }),
+            SummaryItem::Separator,
+            SummaryItem::Link(Link {
+                name: String::from("Second"),
+                location: PathBuf::from("./second.md"),
+                number: Some(SectionNumber(vec![2])),
+                nested_items: Vec::new(),
+            }),
+            SummaryItem::Separator,
+            SummaryItem::Link(Link {
+                name: String::from("Third"),
+                location: PathBuf::from("./third.md"),
+                number: Some(SectionNumber(vec![3])),
+                nested_items: Vec::new(),
+            }),
+        ];
+
+        let mut parser = SummaryParser::new(src);
+        let _ = parser.stream.next();
+
+        let got = parser.parse_numbered().unwrap();
+
+        assert_eq!(got, should_be);
+    }
 }
--- a/src/cmd/build.rs
+++ b/src/cmd/build.rs
@@ -1,21 +1,19 @@
 use clap::{App, ArgMatches, SubCommand};
 use mdbook::errors::Result;
 use mdbook::MDBook;
-use std::path::PathBuf;
 use {get_book_dir, open};

 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("build")
-        .about("Build the book from the markdown files")
-        .arg_from_usage("-o, --open 'Open the compiled book in a web browser'")
+        .about("Builds a book from its markdown files")
        .arg_from_usage(
-            "-d, --dest-dir=[dest-dir] 'The output directory for your book{n}(Defaults to ./book \
-             when omitted)'",
-        )
-        .arg_from_usage(
-            "[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'",
-        )
+            "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
+             (If omitted, uses build.build-dir from book.toml or defaults to ./book)'",
+        ).arg_from_usage(
+            "[dir] 'Root directory for the book{n}\
+             (Defaults to the Current Directory when omitted)'",
+        ).arg_from_usage("-o, --open 'Opens the compiled book in a web browser'")
 }

 // Build command implementation
@@ -24,7 +22,7 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
    let mut book = MDBook::load(&book_dir)?;

    if let Some(dest_dir) = args.value_of("dest-dir") {
-        book.config.build.build_dir = PathBuf::from(dest_dir);
+        book.config.build.build_dir = dest_dir.into();
    }

    book.build()?;
--- a/src/cmd/clean.rs
+++ b/src/cmd/clean.rs
@@ -3,15 +3,17 @@ use get_book_dir;
 use mdbook::errors::*;
 use mdbook::MDBook;
 use std::fs;
-use std::path::PathBuf;

 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("clean")
-        .about("Delete built book")
+        .about("Deletes a built book")
        .arg_from_usage(
-            "-d, --dest-dir=[dest-dir] 'The directory of built book{n}(Defaults to ./book when \
-             omitted)'",
+            "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
+             (If omitted, uses build.build-dir from book.toml or defaults to ./book)'",
+        ).arg_from_usage(
+            "[dir] 'Root directory for the book{n}\
+             (Defaults to the Current Directory when omitted)'",
        )
 }

@@ -21,7 +23,7 @@ pub fn execute(args: &ArgMatches) -> ::mdbook::errors::Result<()> {
    let book = MDBook::load(&book_dir)?;

    let dir_to_remove = match args.value_of("dest-dir") {
-        Some(dest_dir) => PathBuf::from(dest_dir),
+        Some(dest_dir) => dest_dir.into(),
        None => book.root.join(&book.config.build.build_dir),
    };
    fs::remove_dir_all(&dir_to_remove).chain_err(|| "Unable to remove the build directory")?;
--- a/src/cmd/init.rs
+++ b/src/cmd/init.rs
@@ -10,12 +10,12 @@ use std::process::Command;
 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("init")
-        .about("Create boilerplate structure and files in the directory")
+        .about("Creates the boilerplate structure and files for a new book")
        // the {n} denotes a newline which will properly aligned in all help messages
-        .arg_from_usage("[dir] 'A directory for your book{n}(Defaults to Current Directory \
-                         when omitted)'")
+        .arg_from_usage("[dir] 'Directory to create the book in{n}\
+            (Defaults to the Current Directory when omitted)'")
        .arg_from_usage("--theme 'Copies the default theme into your source folder'")
-        .arg_from_usage("--force 'skip confirmation prompts'")
+        .arg_from_usage("--force 'Skips confirmation prompts'")
 }

 // Init command implementation
--- a/src/cmd/serve.rs
+++ b/src/cmd/serve.rs
@@ -7,7 +7,7 @@ use self::iron::{
 };
 #[cfg(feature = "watch")]
 use super::watch;
-use clap::{App, ArgMatches, SubCommand};
+use clap::{App, Arg, ArgMatches, SubCommand};
 use mdbook::errors::*;
 use mdbook::utils;
 use mdbook::MDBook;
@@ -19,23 +19,52 @@ struct ErrorRecover;
 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("serve")
-        .about("Serve the book at http://localhost:3000. Rebuild and reload on change.")
+        .about("Serves a book at http://localhost:3000, and rebuilds it on changes")
        .arg_from_usage(
-            "[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'",
-        )
-        .arg_from_usage("-p, --port=[port] 'Use another port{n}(Defaults to 3000)'")
-        .arg_from_usage(
-            "-w, --websocket-port=[ws-port] 'Use another port for the websocket connection \
-             (livereload){n}(Defaults to 3001)'",
+            "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
+             (If omitted, uses build.build-dir from book.toml or defaults to ./book)'",
        )
        .arg_from_usage(
-            "-i, --interface=[interface] 'Interface to listen on{n}(Defaults to localhost)'",
+            "[dir] 'Root directory for the book{n}\
+             (Defaults to the Current Directory when omitted)'",
        )
-        .arg_from_usage(
-            "-a, --address=[address] 'Address that the browser can reach the websocket server \
-             from{n}(Defaults to the interface address)'",
+        .arg(
+            Arg::with_name("hostname")
+                .short("n")
+                .long("hostname")
+                .takes_value(true)
+                .default_value("localhost")
+                .empty_values(false)
+                .help("Hostname to listen on for HTTP connections"),
        )
-        .arg_from_usage("-o, --open 'Open the book server in a web browser'")
+        .arg(
+            Arg::with_name("port")
+                .short("p")
+                .long("port")
+                .takes_value(true)
+                .default_value("3000")
+                .empty_values(false)
+                .help("Port to use for HTTP connections"),
+        )
+        .arg(
+            Arg::with_name("websocket-hostname")
+                .long("websocket-hostname")
+                .takes_value(true)
+                .empty_values(false)
+                .help(
+                    "Hostname to connect to for WebSockets connections (Defaults to the HTTP hostname)",
+                ),
+        )
+        .arg(
+            Arg::with_name("websocket-port")
+                .short("w")
+                .long("websocket-port")
+                .takes_value(true)
+                .default_value("3001")
+                .empty_values(false)
+                .help("Port to use for WebSockets livereload connections"),
+        )
+        .arg_from_usage("-o, --open 'Opens the book server in a web browser'")
 }

 // Watch command implementation
@@ -43,19 +72,23 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
    let book_dir = get_book_dir(args);
    let mut book = MDBook::load(&book_dir)?;

-    let port = args.value_of("port").unwrap_or("3000");
-    let ws_port = args.value_of("websocket-port").unwrap_or("3001");
-    let interface = args.value_of("interface").unwrap_or("localhost");
-    let public_address = args.value_of("address").unwrap_or(interface);
+    let port = args.value_of("port").unwrap();
+    let ws_port = args.value_of("websocket-port").unwrap();
+    let hostname = args.value_of("hostname").unwrap();
+    let public_address = args.value_of("websocket-address").unwrap_or(hostname);
    let open_browser = args.is_present("open");

-    let address = format!("{}:{}", interface, port);
-    let ws_address = format!("{}:{}", interface, ws_port);
+    let address = format!("{}:{}", hostname, port);
+    let ws_address = format!("{}:{}", hostname, ws_port);

    let livereload_url = format!("ws://{}:{}", public_address, ws_port);
    book.config
        .set("output.html.livereload-url", &livereload_url)?;

+    if let Some(dest_dir) = args.value_of("dest-dir") {
+        book.config.build.build_dir = dest_dir.into();
+    }
+
    book.build()?;

    let mut chain = Chain::new(staticfile::Static::new(book.build_dir_for("html")));
@@ -87,14 +120,12 @@ pub fn execute(args: &ArgMatches) -> Result<()> {

        // FIXME: This area is really ugly because we need to re-set livereload :(

-        let livereload_url = livereload_url.clone();
-
        let result = MDBook::load(&book_dir)
-            .and_then(move |mut b| {
-                b.config.set("output.html.livereload-url", &livereload_url)?;
+            .and_then(|mut b| {
+                b.config
+                    .set("output.html.livereload-url", &livereload_url)?;
                Ok(b)
-            })
-            .and_then(|b| b.build());
+            }).and_then(|b| b.build());

        if let Err(e) = result {
            error!("Unable to load the book");
--- a/src/cmd/test.rs
+++ b/src/cmd/test.rs
@@ -1,4 +1,4 @@
-use clap::{App, ArgMatches, SubCommand};
+use clap::{App, Arg, ArgMatches, SubCommand};
 use get_book_dir;
 use mdbook::errors::Result;
 use mdbook::MDBook;
@@ -6,18 +6,39 @@ use mdbook::MDBook;
 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("test")
-        .about("Test that code samples compile")
-        .arg_from_usage("-L, --library-path [DIR]... 'directory to add to crate search path'")
+        .about("Tests that a book's Rust code samples compile")
+        .arg_from_usage(
+            "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
+             (If omitted, uses build.build-dir from book.toml or defaults to ./book)'",
+        )
+        .arg_from_usage(
+            "[dir] 'Root directory for the book{n}\
+             (Defaults to the Current Directory when omitted)'",
+        )
+        .arg(Arg::with_name("library-path")
+            .short("L")
+            .long("library-path")
+            .value_name("dir")
+            .takes_value(true)
+            .require_delimiter(true)
+            .multiple(true)
+            .empty_values(false)
+            .help("A comma-separated list of directories to add to {n}the crate search path when building tests"))
 }

 // test command implementation
 pub fn execute(args: &ArgMatches) -> Result<()> {
-    let library_paths: Vec<&str> = args.values_of("library-path")
+    let library_paths: Vec<&str> = args
+        .values_of("library-path")
        .map(|v| v.collect())
        .unwrap_or_default();
    let book_dir = get_book_dir(args);
    let mut book = MDBook::load(&book_dir)?;

+    if let Some(dest_dir) = args.value_of("dest-dir") {
+        book.config.build.build_dir = dest_dir.into();
+    }
+
    book.test(library_paths)?;

    Ok(())
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -13,11 +13,14 @@ use {get_book_dir, open};
 // Create clap subcommand arguments
 pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
    SubCommand::with_name("watch")
-        .about("Watch the files for changes")
-        .arg_from_usage("-o, --open 'Open the compiled book in a web browser'")
+        .about("Watches a book's files and rebuilds it on changes")
        .arg_from_usage(
-            "[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'",
-        )
+            "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
+             (If omitted, uses build.build-dir from book.toml or defaults to ./book)'",
+        ).arg_from_usage(
+            "[dir] 'Root directory for the book{n}\
+             (Defaults to the Current Directory when omitted)'",
+        ).arg_from_usage("-o, --open 'Open the compiled book in a web browser'")
 }

 // Watch command implementation
--- a/src/config.rs
+++ b/src/config.rs
@@ -209,6 +209,18 @@ impl Config {
        Ok(())
    }

+    /// Get the table associated with a particular renderer.
+    pub fn get_renderer<I: AsRef<str>>(&self, index: I) -> Option<&Table> {
+        let key = format!("output.{}", index.as_ref());
+        self.get(&key).and_then(|v| v.as_table())
+    }
+
+    /// Get the table associated with a particular preprocessor.
+    pub fn get_preprocessor<I: AsRef<str>>(&self, index: I) -> Option<&Table> {
+        let key = format!("preprocessor.{}", index.as_ref());
+        self.get(&key).and_then(|v| v.as_table())
+    }
+
    fn from_legacy(mut table: Value) -> Config {
        let mut cfg = Config::default();

@@ -382,8 +394,9 @@ pub struct BuildConfig {
    /// Should non-existent markdown files specified in `SETTINGS.md` be created
    /// if they don't exist?
    pub create_missing: bool,
-    /// Which preprocessors should be applied
-    pub preprocess: Option<Vec<String>>,
+    /// Should the default preprocessors always be used when they are
+    /// compatible with the renderer?
+    pub use_default_preprocessors: bool,
 }

 impl Default for BuildConfig {
@@ -391,7 +404,7 @@ impl Default for BuildConfig {
        BuildConfig {
            build_dir: PathBuf::from("book"),
            create_missing: true,
-            preprocess: None,
+            use_default_preprocessors: true,
        }
    }
 }
@@ -534,11 +547,7 @@ trait Updateable<'de>: Serialize + Deserialize<'de> {
    }
 }

-impl<'de, T> Updateable<'de> for T
-where
-    T: Serialize + Deserialize<'de>,
-{
-}
+impl<'de, T> Updateable<'de> for T where T: Serialize + Deserialize<'de> {}

 #[cfg(test)]
 mod tests {
@@ -555,7 +564,7 @@ mod tests {
        [build]
        build-dir = "outputs"
        create-missing = false
-        preprocess = ["first_preprocessor", "second_preprocessor"]
+        use-default-preprocessors = true

        [output.html]
        theme = "./themedir"
@@ -566,6 +575,10 @@ mod tests {
        [output.html.playpen]
        editable = true
        editor = "ace"
+
+        [preprocess.first]
+
+        [preprocess.second]
        "#;

    #[test]
@@ -583,10 +596,7 @@ mod tests {
        let build_should_be = BuildConfig {
            build_dir: PathBuf::from("outputs"),
            create_missing: false,
-            preprocess: Some(vec![
-                "first_preprocessor".to_string(),
-                "second_preprocessor".to_string(),
-            ]),
+            use_default_preprocessors: true,
        };
        let playpen_should_be = Playpen {
            editable: true,
@@ -688,7 +698,7 @@ mod tests {
        let build_should_be = BuildConfig {
            build_dir: PathBuf::from("my-book"),
            create_missing: true,
-            preprocess: None,
+            use_default_preprocessors: true,
        };

        let html_should_be = HtmlConfig {
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -114,6 +114,12 @@ pub mod renderer;
 pub mod theme;
 pub mod utils;

+/// The current version of `mdbook`.
+///
+/// This is provided as a way for custom preprocessors and renderers to do
+/// compatibility checks.
+pub const MDBOOK_VERSION: &str = env!("CARGO_PKG_VERSION");
+
 pub use book::BookItem;
 pub use book::MDBook;
 pub use config::Config;
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,26 +20,27 @@ use std::path::{Path, PathBuf};

 mod cmd;

-const NAME: &'static str = "mdbook";
+const NAME: &'static str = "mdBook";
+const VERSION: &'static str = concat!("v", crate_version!());

 fn main() {
    init_logger();

    // Create a list of valid arguments and sub-commands
    let app = App::new(NAME)
-                .about("Create a book in form of a static website from markdown files")
-                .author("Mathieu David <mathieudavid@mathieudavid.org>")
-                // Get the version from our Cargo.toml using clap's crate_version!() macro
-                .version(concat!("v",crate_version!()))
-                .setting(AppSettings::ArgRequiredElseHelp)
-                .after_help("For more information about a specific command, \
-                             try `mdbook <command> --help`\n\
-                             Source code for mdbook available \
-                             at: https://github.com/rust-lang-nursery/mdBook")
-                .subcommand(cmd::init::make_subcommand())
-                .subcommand(cmd::build::make_subcommand())
-                .subcommand(cmd::test::make_subcommand())
-                .subcommand(cmd::clean::make_subcommand());
+        .about("Creates a book from markdown files")
+        .author("Mathieu David <mathieudavid@mathieudavid.org>")
+        .version(VERSION)
+        .setting(AppSettings::GlobalVersion)
+        .setting(AppSettings::ArgRequiredElseHelp)
+        .after_help(
+            "For more information about a specific command, try `mdbook <command> --help`\n\
+             The source code for mdBook is available at: https://github.com/rust-lang-nursery/mdBook",
+        )
+        .subcommand(cmd::init::make_subcommand())
+        .subcommand(cmd::build::make_subcommand())
+        .subcommand(cmd::test::make_subcommand())
+        .subcommand(cmd::clean::make_subcommand());

    #[cfg(feature = "watch")]
    let app = app.subcommand(cmd::watch::make_subcommand());
--- a/src/preprocess/cmd.rs
+++ b/src/preprocess/cmd.rs
@@ -0,0 +1,154 @@
+use super::{Preprocessor, PreprocessorContext};
+use book::Book;
+use errors::*;
+use serde_json;
+use shlex::Shlex;
+use std::io::{self, Read, Write};
+use std::process::{Child, Command, Stdio};
+
+/// A custom preprocessor which will shell out to a 3rd-party program.
+///
+/// # Preprocessing Protocol
+///
+/// When the `supports_renderer()` method is executed, `CmdPreprocessor` will
+/// execute the shell command `$cmd supports $renderer`. If the renderer is
+/// supported, custom preprocessors should exit with a exit code of `0`,
+/// any other exit code be considered as unsupported.
+///
+/// The `run()` method is implemented by passing a `(PreprocessorContext, Book)`
+/// tuple to the spawned command (`$cmd`) as JSON via `stdin`. Preprocessors
+/// should then "return" a processed book by printing it to `stdout` as JSON.
+/// For convenience, the `CmdPreprocessor::parse_input()` function can be used
+/// to parse the input provided by `mdbook`.
+///
+/// Exiting with a non-zero exit code while preprocessing is considered an
+/// error. `stderr` is passed directly through to the user, so it can be used
+/// for logging or emitting warnings if desired.
+///
+/// # Examples
+///
+/// An example preprocessor is available in this project's `examples/`
+/// directory.
+#[derive(Debug, Clone, PartialEq)]
+pub struct CmdPreprocessor {
+    name: String,
+    cmd: String,
+}
+
+impl CmdPreprocessor {
+    /// Create a new `CmdPreprocessor`.
+    pub fn new(name: String, cmd: String) -> CmdPreprocessor {
+        CmdPreprocessor { name, cmd }
+    }
+
+    /// A convenience function custom preprocessors can use to parse the input
+    /// written to `stdin` by a `CmdRenderer`.
+    pub fn parse_input<R: Read>(
+        reader: R,
+    ) -> Result<(PreprocessorContext, Book)> {
+        serde_json::from_reader(reader)
+            .chain_err(|| "Unable to parse the input")
+    }
+
+    fn write_input_to_child(
+        &self,
+        child: &mut Child,
+        book: &Book,
+        ctx: &PreprocessorContext,
+    ) {
+        let stdin = child.stdin.take().expect("Child has stdin");
+
+        if let Err(e) = self.write_input(stdin, &book, &ctx) {
+            // Looks like the backend hung up before we could finish
+            // sending it the render context. Log the error and keep going
+            warn!("Error writing the RenderContext to the backend, {}", e);
+        }
+    }
+
+    fn write_input<W: Write>(&self, writer: W, book: &Book, ctx: &PreprocessorContext) -> Result<()> {
+        serde_json::to_writer(writer, &(ctx, book))
+            .map_err(Into::into)
+    }
+
+    /// The command this `Preprocessor` will invoke.
+    pub fn cmd(&self) -> &str {
+        &self.cmd
+    }
+
+    fn command(&self) -> Result<Command> {
+        let mut words = Shlex::new(&self.cmd);
+        let executable = match words.next() {
+            Some(e) => e,
+            None => bail!("Command string was empty"),
+        };
+
+        let mut cmd = Command::new(executable);
+
+        for arg in words {
+            cmd.arg(arg);
+        }
+
+        Ok(cmd)
+    }
+}
+
+impl Preprocessor for CmdPreprocessor {
+    fn name(&self) -> &str {
+        &self.name
+    }
+
+    fn run(&self, ctx: &PreprocessorContext, book: Book) -> Result<Book> {
+        let mut cmd = self.command()?;
+
+        let mut child = cmd
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::inherit())
+            .spawn()
+            .chain_err(|| format!("Unable to start the \"{}\" preprocessor. Is it installed?", self.name()))?;
+
+        self.write_input_to_child(&mut child, &book, ctx);
+
+        let output = child
+            .wait_with_output()
+            .chain_err(|| "Error waiting for the preprocessor to complete")?;
+
+        trace!("{} exited with output: {:?}", self.cmd, output);
+        ensure!(output.status.success(), "The preprocessor exited unsuccessfully");
+
+        serde_json::from_slice(&output.stdout).chain_err(|| "Unable to parse the preprocessed book")
+    }
+
+    fn supports_renderer(&self, renderer: &str) -> bool {
+        debug!("Checking if the \"{}\" preprocessor supports \"{}\"", self.name(), renderer);
+
+        let mut cmd = match self.command() {
+            Ok(c) => c,
+            Err(e) => {
+                warn!("Unable to create the command for the \"{}\" preprocessor, {}", self.name(), e);
+                return false;
+            }
+        };
+
+        let outcome = cmd
+            .arg("supports")
+            .arg(renderer)
+            .stdin(Stdio::null())
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
+            .status()
+            .map(|status| status.code() == Some(0));
+
+        if let Err(ref e) = outcome {
+            if e.kind() == io::ErrorKind::NotFound {
+                warn!(
+                    "The command wasn't found, is the \"{}\" preprocessor installed?",
+                    self.name
+                );
+                warn!("\tCommand: {}", self.cmd);
+            }
+        }
+
+        outcome.unwrap_or(false)
+    }
+}
--- a/src/preprocess/index.rs
+++ b/src/preprocess/index.rs
@@ -11,6 +11,8 @@ use book::{Book, BookItem};
 pub struct IndexPreprocessor;

 impl IndexPreprocessor {
+    pub(crate) const NAME: &'static str = "index";
+
    /// Create a new `IndexPreprocessor`.
    pub fn new() -> Self {
        IndexPreprocessor
@@ -19,10 +21,10 @@ impl IndexPreprocessor {

 impl Preprocessor for IndexPreprocessor {
    fn name(&self) -> &str {
-        "index"
+        Self::NAME
    }

-    fn run(&self, ctx: &PreprocessorContext, book: &mut Book) -> Result<()> {
+    fn run(&self, ctx: &PreprocessorContext, mut book: Book) -> Result<Book> {
        let source_dir = ctx.root.join(&ctx.config.book.src);
        book.for_each_mut(|section: &mut BookItem| {
            if let BookItem::Chapter(ref mut ch) = *section {
@@ -37,7 +39,7 @@ impl Preprocessor for IndexPreprocessor {
            }
        });

-        Ok(())
+        Ok(book)
    }
 }

--- a/src/preprocess/links.rs
+++ b/src/preprocess/links.rs
@@ -16,6 +16,8 @@ const MAX_LINK_NESTED_DEPTH: usize = 10;
 pub struct LinkPreprocessor;

 impl LinkPreprocessor {
+    pub(crate) const NAME: &'static str = "links";
+
    /// Create a new `LinkPreprocessor`.
    pub fn new() -> Self {
        LinkPreprocessor
@@ -24,15 +26,16 @@ impl LinkPreprocessor {

 impl Preprocessor for LinkPreprocessor {
    fn name(&self) -> &str {
-        "links"
+        Self::NAME
    }

-    fn run(&self, ctx: &PreprocessorContext, book: &mut Book) -> Result<()> {
+    fn run(&self, ctx: &PreprocessorContext, mut book: Book) -> Result<Book> {
        let src_dir = ctx.root.join(&ctx.config.book.src);

        book.for_each_mut(|section: &mut BookItem| {
            if let BookItem::Chapter(ref mut ch) = *section {
-                let base = ch.path
+                let base = ch
+                    .path
                    .parent()
                    .map(|dir| src_dir.join(dir))
                    .expect("All book items have a parent");
@@ -42,11 +45,15 @@ impl Preprocessor for LinkPreprocessor {
            }
        });

-        Ok(())
+        Ok(book)
    }
 }

-fn replace_all<P: AsRef<Path>>(s: &str, path: P, source: &P, depth: usize) -> String {
+fn replace_all<P1, P2>(s: &str, path: P1, source: P2, depth: usize) -> String
+where
+    P1: AsRef<Path>,
+    P2: AsRef<Path>,
+{
    // When replacing one thing in a string by something with a different length,
    // the indices after that will not correspond,
    // we therefore have to store the difference to correct this
@@ -65,9 +72,11 @@ fn replace_all<P: AsRef<Path>>(s: &str, path: P, source: &P, depth: usize) -> St
                        replaced.push_str(&replace_all(
                            &new_content,
                            rel_path,
-                            &source.to_path_buf(),
+                            source,
                            depth + 1,
                        ));
+                    } else {
+                        replaced.push_str(&new_content);
                    }
                } else {
                    error!(
@@ -79,6 +88,10 @@ fn replace_all<P: AsRef<Path>>(s: &str, path: P, source: &P, depth: usize) -> St
            }
            Err(e) => {
                error!("Error updating \"{}\", {}", playpen.link_text, e);
+                for cause in e.iter().skip(1) {
+                    warn!("Caused By: {}", cause);
+                }
+
                // This should make sure we include the raw `{{# ... }}` snippet
                // in the page content if there are any errors.
                previous_end_index = playpen.start_index;
@@ -105,10 +118,18 @@ impl<'a> LinkType<'a> {
        let base = base.as_ref();
        match self {
            LinkType::Escaped => None,
-            LinkType::IncludeRange(p, _) => Some(return_relative_path(base, &p)),
-            LinkType::IncludeRangeFrom(p, _) => Some(return_relative_path(base, &p)),
-            LinkType::IncludeRangeTo(p, _) => Some(return_relative_path(base, &p)),
-            LinkType::IncludeRangeFull(p, _) => Some(return_relative_path(base, &p)),
+            LinkType::IncludeRange(p, _) => {
+                Some(return_relative_path(base, &p))
+            }
+            LinkType::IncludeRangeFrom(p, _) => {
+                Some(return_relative_path(base, &p))
+            }
+            LinkType::IncludeRangeTo(p, _) => {
+                Some(return_relative_path(base, &p))
+            }
+            LinkType::IncludeRangeFull(p, _) => {
+                Some(return_relative_path(base, &p))
+            }
            LinkType::Playpen(p, _) => Some(return_relative_path(base, &p)),
        }
    }
@@ -178,11 +199,15 @@ impl<'a> Link<'a> {

                match (typ.as_str(), file_arg) {
                    ("include", Some(pth)) => Some(parse_include_path(pth)),
-                    ("playpen", Some(pth)) => Some(LinkType::Playpen(pth.into(), props)),
+                    ("playpen", Some(pth)) => {
+                        Some(LinkType::Playpen(pth.into(), props))
+                    }
                    _ => None,
                }
            }
-            (Some(mat), None, None) if mat.as_str().starts_with(ESCAPE_CHAR) => {
+            (Some(mat), None, None)
+                if mat.as_str().starts_with(ESCAPE_CHAR) =>
+            {
                Some(LinkType::Escaped)
            }
            _ => None,
@@ -203,20 +228,65 @@ impl<'a> Link<'a> {
        match self.link {
            // omit the escape char
            LinkType::Escaped => Ok((&self.link_text[1..]).to_owned()),
-            LinkType::IncludeRange(ref pat, ref range) => file_to_string(base.join(pat))
-                .map(|s| take_lines(&s, range.clone()))
-                .chain_err(|| format!("Could not read file for link {}", self.link_text)),
-            LinkType::IncludeRangeFrom(ref pat, ref range) => file_to_string(base.join(pat))
-                .map(|s| take_lines(&s, range.clone()))
-                .chain_err(|| format!("Could not read file for link {}", self.link_text)),
-            LinkType::IncludeRangeTo(ref pat, ref range) => file_to_string(base.join(pat))
-                .map(|s| take_lines(&s, range.clone()))
-                .chain_err(|| format!("Could not read file for link {}", self.link_text)),
-            LinkType::IncludeRangeFull(ref pat, _) => file_to_string(base.join(pat))
-                .chain_err(|| format!("Could not read file for link {}", self.link_text)),
+            LinkType::IncludeRange(ref pat, ref range) => {
+                let target = base.join(pat);
+
+                file_to_string(&target)
+                    .map(|s| take_lines(&s, range.clone()))
+                    .chain_err(|| {
+                        format!(
+                            "Could not read file for link {} ({})",
+                            self.link_text,
+                            target.display(),
+                        )
+                    })
+            }
+            LinkType::IncludeRangeFrom(ref pat, ref range) => {
+                let target = base.join(pat);
+
+                file_to_string(&target)
+                    .map(|s| take_lines(&s, range.clone()))
+                    .chain_err(|| {
+                        format!(
+                            "Could not read file for link {} ({})",
+                            self.link_text,
+                            target.display(),
+                        )
+                    })
+            }
+            LinkType::IncludeRangeTo(ref pat, ref range) => {
+                let target = base.join(pat);
+
+                file_to_string(&target)
+                    .map(|s| take_lines(&s, range.clone()))
+                    .chain_err(|| {
+                        format!(
+                            "Could not read file for link {} ({})",
+                            self.link_text,
+                            target.display(),
+                        )
+                    })
+            }
+            LinkType::IncludeRangeFull(ref pat, _) => {
+                let target = base.join(pat);
+
+                file_to_string(&target).chain_err(|| {
+                    format!("Could not read file for link {} ({})",
+                            self.link_text,
+                            target.display())
+                })
+            }
            LinkType::Playpen(ref pat, ref attrs) => {
-                let contents = file_to_string(base.join(pat))
-                    .chain_err(|| format!("Could not read file for link {}", self.link_text))?;
+                let target = base.join(pat);
+
+                let contents =
+                file_to_string(&target).chain_err(|| {
+                        format!(
+                            "Could not read file for link {} ({})",
+                            self.link_text,
+                            target.display()
+                        )
+                    })?;
                let ftype = if !attrs.is_empty() { "rust," } else { "rust" };
                Ok(format!(
                    "```{}{}\n{}\n```\n",
@@ -265,6 +335,21 @@ fn find_links(contents: &str) -> LinkIter {
 mod tests {
    use super::*;

+    #[test]
+    fn test_replace_all_escaped() {
+        let start = r"
+        Some text over here.
+        ```hbs
+        \{{#include file.rs}} << an escaped link!
+        ```";
+        let end = r"
+        Some text over here.
+        ```hbs
+        {{#include file.rs}} << an escaped link!
+        ```";
+        assert_eq!(replace_all(start, "", "", 0), end);
+    }
+
    #[test]
    fn test_find_links_no_link() {
        let s = "Some random text without link...";
@@ -446,7 +531,10 @@ mod tests {
                Link {
                    start_index: 38,
                    end_index: 68,
-                    link: LinkType::Playpen(PathBuf::from("file.rs"), vec!["editable"]),
+                    link: LinkType::Playpen(
+                        PathBuf::from("file.rs"),
+                        vec!["editable"]
+                    ),
                    link_text: "{{#playpen file.rs editable }}",
                },
                Link {
@@ -456,7 +544,8 @@ mod tests {
                        PathBuf::from("my.rs"),
                        vec!["editable", "no_run", "should_panic"],
                    ),
-                    link_text: "{{#playpen my.rs editable no_run should_panic}}",
+                    link_text:
+                        "{{#playpen my.rs editable no_run should_panic}}",
                },
            ]
        );
--- a/src/preprocess/mod.rs
+++ b/src/preprocess/mod.rs
@@ -2,9 +2,11 @@

 pub use self::index::IndexPreprocessor;
 pub use self::links::LinkPreprocessor;
+pub use self::cmd::CmdPreprocessor;

 mod index;
 mod links;
+mod cmd;

 use book::Book;
 use config::Config;
@@ -14,17 +16,29 @@ use std::path::PathBuf;

 /// Extra information for a `Preprocessor` to give them more context when
 /// processing a book.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct PreprocessorContext {
    /// The location of the book directory on disk.
    pub root: PathBuf,
    /// The book configuration (`book.toml`).
    pub config: Config,
+    /// The `Renderer` this preprocessor is being used with.
+    pub renderer: String,
+    /// The calling `mdbook` version.
+    pub mdbook_version: String,
+    __non_exhaustive: (),
 }

 impl PreprocessorContext {
    /// Create a new `PreprocessorContext`.
-    pub(crate) fn new(root: PathBuf, config: Config) -> Self {
-        PreprocessorContext { root, config }
+    pub(crate) fn new(root: PathBuf, config: Config, renderer: String) -> Self {
+        PreprocessorContext {
+            root,
+            config,
+            renderer,
+            mdbook_version: ::MDBOOK_VERSION.to_string(),
+            __non_exhaustive: (),
+        }
    }
 }

@@ -36,5 +50,13 @@ pub trait Preprocessor {

    /// Run this `Preprocessor`, allowing it to update the book before it is
    /// given to a renderer.
-    fn run(&self, ctx: &PreprocessorContext, book: &mut Book) -> Result<()>;
+    fn run(&self, ctx: &PreprocessorContext, book: Book) -> Result<Book>;
+
+    /// A hint to `MDBook` whether this preprocessor is compatible with a
+    /// particular renderer.
+    ///
+    /// By default, always returns `true`.
+    fn supports_renderer(&self, _renderer: &str) -> bool {
+        true
+    }
 }
--- a/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -1,4 +1,4 @@
-use book::{Book, BookItem, Chapter};
+use book::{Book, BookItem};
 use config::{Config, HtmlConfig, Playpen};
 use errors::*;
 use renderer::html_handlebars::helpers;
@@ -8,8 +8,7 @@ use utils;

 use std::collections::BTreeMap;
 use std::collections::HashMap;
-use std::fs::{self, File};
-use std::io::Read;
+use std::fs;
 use std::path::{Path, PathBuf};

 use handlebars::Handlebars;
@@ -38,7 +37,8 @@ impl HtmlHandlebars {
                print_content.push_str(&content);

                // Update the context with data for this file
-                let path = ch.path
+                let path = ch
+                    .path
                    .to_str()
                    .chain_err(|| "Could not convert path to str")?;
                let filepath = Path::new(&ch.path).with_extension("html");
@@ -51,7 +51,8 @@ impl HtmlHandlebars {
                // Non-lexical lifetimes needed :'(
                let title: String;
                {
-                    let book_title = ctx.data
+                    let book_title = ctx
+                        .data
                        .get("book_title")
                        .and_then(serde_json::Value::as_str)
                        .unwrap_or("");
@@ -74,11 +75,21 @@ impl HtmlHandlebars {
                let rendered = self.post_process(rendered, &ctx.html_config.playpen);

                // Write to file
-                debug!("Creating {} ✓", filepath.display());
-                utils::fs::write_file(&ctx.destination, &filepath, &rendered.into_bytes())?;
+                debug!("Creating {}", filepath.display());
+                utils::fs::write_file(&ctx.destination, &filepath, rendered.as_bytes())?;

                if ctx.is_index {
-                    self.render_index(ch, &ctx.destination)?;
+                    ctx.data.insert("path".to_owned(), json!("index.html"));
+                    ctx.data.insert("path_to_root".to_owned(), json!(""));
+                    let rendered_index = ctx.handlebars.render("index", &ctx.data)?;
+                    let rendered_index =
+                        self.post_process(rendered_index, &ctx.html_config.playpen);
+                    debug!("Creating index.html from {}", path);
+                    utils::fs::write_file(
+                        &ctx.destination,
+                        "index.html",
+                        rendered_index.as_bytes(),
+                    )?;
                }
            }
            _ => {}
@@ -87,34 +98,6 @@ impl HtmlHandlebars {
        Ok(())
    }

-    /// Create an index.html from the first element in SUMMARY.md
-    fn render_index(&self, ch: &Chapter, destination: &Path) -> Result<()> {
-        debug!("index.html");
-
-        let mut content = String::new();
-
-        File::open(destination.join(&ch.path.with_extension("html")))?
-            .read_to_string(&mut content)?;
-
-        // This could cause a problem when someone displays
-        // code containing <base href=...>
-        // on the front page, however this case should be very very rare...
-        content = content
-            .lines()
-            .filter(|line| !line.contains("<base href="))
-            .collect::<Vec<&str>>()
-            .join("\n");
-
-        utils::fs::write_file(destination, "index.html", content.as_bytes())?;
-
-        debug!(
-            "Creating index.html from {} ✓",
-            destination.join(&ch.path.with_extension("html")).display()
-        );
-
-        Ok(())
-    }
-
    #[cfg_attr(feature = "cargo-clippy", allow(let_and_return))]
    fn post_process(&self, rendered: String, playpen_config: &Playpen) -> String {
        let rendered = build_header_links(&rendered);
@@ -363,7 +346,7 @@ impl Renderer for HtmlHandlebars {

        let rendered = self.post_process(rendered, &html_config.playpen);

-        utils::fs::write_file(&destination, "print.html", &rendered.into_bytes())?;
+        utils::fs::write_file(&destination, "print.html", rendered.as_bytes())?;
        debug!("Creating print.html ✓");

        debug!("Copy static files");
@@ -484,7 +467,8 @@ fn make_data(
                }

                chapter.insert("name".to_owned(), json!(ch.name));
-                let path = ch.path
+                let path = ch
+                    .path
                    .to_str()
                    .chain_err(|| "Could not convert path to str")?;
                chapter.insert("path".to_owned(), json!(path));
@@ -516,8 +500,7 @@ fn build_header_links(html: &str) -> String {
                .expect("Regex should ensure we only ever get numbers here");

            wrap_header_with_link(level, &caps[2], &mut id_counter)
-        })
-        .into_owned()
+        }).into_owned()
 }

 /// Wraps a single header tag with a link, making sure each tag gets its own
@@ -568,8 +551,7 @@ fn fix_code_blocks(html: &str) -> String {
                classes = classes,
                after = after
            )
-        })
-        .into_owned()
+        }).into_owned()
 }

 fn add_playpen_pre(html: &str, playpen_config: &Playpen) -> String {
@@ -605,8 +587,7 @@ fn add_playpen_pre(html: &str, playpen_config: &Playpen) -> String {
                // not language-rust, so no-op
                text.to_owned()
            }
-        })
-        .into_owned()
+        }).into_owned()
 }

 fn partition_source(s: &str) -> (String, String) {
--- a/src/renderer/html_handlebars/helpers/navigation.rs
+++ b/src/renderer/html_handlebars/helpers/navigation.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 use std::path::Path;

-use handlebars::{Context, Handlebars, Helper, RenderContext, RenderError, Renderable};
+use handlebars::{Context, Handlebars, Helper, Output, RenderContext, RenderError, Renderable};
 use serde_json;

 use utils;
@@ -45,15 +45,20 @@ impl Target {
    }
 }

-fn find_chapter(rc: &mut RenderContext, target: Target) -> Result<Option<StringMap>, RenderError> {
+fn find_chapter(
+    ctx: &Context,
+    rc: &mut RenderContext,
+    target: Target,
+) -> Result<Option<StringMap>, RenderError> {
    debug!("Get data from context");

-    let chapters = rc.evaluate_absolute("chapters", true).and_then(|c| {
+    let chapters = rc.evaluate_absolute(ctx, "chapters", true).and_then(|c| {
        serde_json::value::from_value::<Vec<StringMap>>(c.clone())
            .map_err(|_| RenderError::new("Could not decode the JSON data"))
    })?;

-    let base_path = rc.evaluate_absolute("path", true)?
+    let base_path = rc
+        .evaluate_absolute(ctx, "path", true)?
        .as_str()
        .ok_or_else(|| RenderError::new("Type error for `path`, string expected"))?
        .replace("\"", "");
@@ -83,13 +88,16 @@ fn find_chapter(rc: &mut RenderContext, target: Target) -> Result<Option<StringM
 fn render(
    _h: &Helper,
    r: &Handlebars,
+    ctx: &Context,
    rc: &mut RenderContext,
+    out: &mut Output,
    chapter: &StringMap,
 ) -> Result<(), RenderError> {
    trace!("Creating BTreeMap to inject in context");

    let mut context = BTreeMap::new();
-    let base_path = rc.evaluate_absolute("path", false)?
+    let base_path = rc
+        .evaluate_absolute(ctx, "path", false)?
        .as_str()
        .ok_or_else(|| RenderError::new("Type error for `path`, string expected"))?
        .replace("\"", "");
@@ -120,28 +128,41 @@ fn render(
    _h.template()
        .ok_or_else(|| RenderError::new("Error with the handlebars template"))
        .and_then(|t| {
-            let mut local_rc = rc.with_context(Context::wraps(&context)?);
-            t.render(r, &mut local_rc)
+            let mut local_rc = rc.new_for_block();
+            let local_ctx = Context::wraps(&context)?;
+            t.render(r, &local_ctx, &mut local_rc, out)
        })?;

    Ok(())
 }

-pub fn previous(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+pub fn previous(
+    _h: &Helper,
+    r: &Handlebars,
+    ctx: &Context,
+    rc: &mut RenderContext,
+    out: &mut Output,
+) -> Result<(), RenderError> {
    trace!("previous (handlebars helper)");

-    if let Some(previous) = find_chapter(rc, Target::Previous)? {
-        render(_h, r, rc, &previous)?;
+    if let Some(previous) = find_chapter(ctx, rc, Target::Previous)? {
+        render(_h, r, ctx, rc, out, &previous)?;
    }

    Ok(())
 }

-pub fn next(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+pub fn next(
+    _h: &Helper,
+    r: &Handlebars,
+    ctx: &Context,
+    rc: &mut RenderContext,
+    out: &mut Output,
+) -> Result<(), RenderError> {
    trace!("next (handlebars helper)");

-    if let Some(next) = find_chapter(rc, Target::Next)? {
-        render(_h, r, rc, &next)?;
+    if let Some(next) = find_chapter(ctx, rc, Target::Next)? {
+        render(_h, r, ctx, rc, out, &next)?;
    }

    Ok(())
--- a/src/renderer/html_handlebars/helpers/toc.rs
+++ b/src/renderer/html_handlebars/helpers/toc.rs
@@ -3,7 +3,7 @@ use std::path::Path;

 use utils;

-use handlebars::{Handlebars, Helper, HelperDef, RenderContext, RenderError};
+use handlebars::{Context, Handlebars, Helper, HelperDef, Output, RenderContext, RenderError};
 use pulldown_cmark::{html, Event, Parser, Tag};
 use serde_json;

@@ -14,27 +14,35 @@ pub struct RenderToc {
 }

 impl HelperDef for RenderToc {
-    fn call(&self, _h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
+    fn call<'reg: 'rc, 'rc>(
+        &self,
+        _h: &Helper,
+        _: &Handlebars,
+        ctx: &Context,
+        rc: &mut RenderContext,
+        out: &mut Output,
+    ) -> Result<(), RenderError> {
        // get value from context data
        // rc.get_path() is current json parent path, you should always use it like this
        // param is the key of value you want to display
-        let chapters = rc.evaluate_absolute("chapters", true).and_then(|c| {
+        let chapters = rc.evaluate_absolute(ctx, "chapters", true).and_then(|c| {
            serde_json::value::from_value::<Vec<BTreeMap<String, String>>>(c.clone())
                .map_err(|_| RenderError::new("Could not decode the JSON data"))
        })?;
-        let current = rc.evaluate_absolute("path", true)?
+        let current = rc
+            .evaluate_absolute(ctx, "path", true)?
            .as_str()
            .ok_or_else(|| RenderError::new("Type error for `path`, string expected"))?
            .replace("\"", "");

-        rc.writer.write_all(b"<ol class=\"chapter\">")?;
+        out.write("<ol class=\"chapter\">")?;

        let mut current_level = 1;

        for item in chapters {
            // Spacer
            if item.get("spacer").is_some() {
-                rc.writer.write_all(b"<li class=\"spacer\"></li>")?;
+                out.write("<li class=\"spacer\"></li>")?;
                continue;
            }

@@ -46,30 +54,30 @@ impl HelperDef for RenderToc {

            if level > current_level {
                while level > current_level {
-                    rc.writer.write_all(b"<li>")?;
-                    rc.writer.write_all(b"<ol class=\"section\">")?;
+                    out.write("<li>")?;
+                    out.write("<ol class=\"section\">")?;
                    current_level += 1;
                }
-                rc.writer.write_all(b"<li>")?;
+                out.write("<li>")?;
            } else if level < current_level {
                while level < current_level {
-                    rc.writer.write_all(b"</ol>")?;
-                    rc.writer.write_all(b"</li>")?;
+                    out.write("</ol>")?;
+                    out.write("</li>")?;
                    current_level -= 1;
                }
-                rc.writer.write_all(b"<li>")?;
+                out.write("<li>")?;
            } else {
-                rc.writer.write_all(b"<li")?;
+                out.write("<li")?;
                if item.get("section").is_none() {
-                    rc.writer.write_all(b" class=\"affix\"")?;
+                    out.write(" class=\"affix\"")?;
                }
-                rc.writer.write_all(b">")?;
+                out.write(">")?;
            }

            // Link
            let path_exists = if let Some(path) = item.get("path") {
                if !path.is_empty() {
-                    rc.writer.write_all(b"<a href=\"")?;
+                    out.write("<a href=\"")?;

                    let tmp = Path::new(item.get("path").expect("Error: path should be Some(_)"))
                        .with_extension("html")
@@ -79,16 +87,15 @@ impl HelperDef for RenderToc {
                        .replace("\\", "/");

                    // Add link
-                    rc.writer
-                        .write_all(&utils::fs::path_to_root(&current).as_bytes())?;
-                    rc.writer.write_all(tmp.as_bytes())?;
-                    rc.writer.write_all(b"\"")?;
+                    out.write(&utils::fs::path_to_root(&current))?;
+                    out.write(&tmp)?;
+                    out.write("\"")?;

                    if path == &current {
-                        rc.writer.write_all(b" class=\"active\"")?;
+                        out.write(" class=\"active\"")?;
                    }

-                    rc.writer.write_all(b">")?;
+                    out.write(">")?;
                    true
                } else {
                    false
@@ -100,9 +107,9 @@ impl HelperDef for RenderToc {
            if !self.no_section_label {
                // Section does not necessarily exist
                if let Some(section) = item.get("section") {
-                    rc.writer.write_all(b"<strong aria-hidden=\"true\">")?;
-                    rc.writer.write_all(section.as_bytes())?;
-                    rc.writer.write_all(b"</strong> ")?;
+                    out.write("<strong aria-hidden=\"true\">")?;
+                    out.write(&section)?;
+                    out.write("</strong> ")?;
                }
            }

@@ -123,22 +130,22 @@ impl HelperDef for RenderToc {
                html::push_html(&mut markdown_parsed_name, parser);

                // write to the handlebars template
-                rc.writer.write_all(markdown_parsed_name.as_bytes())?;
+                out.write(&markdown_parsed_name)?;
            }

            if path_exists {
-                rc.writer.write_all(b"</a>")?;
+                out.write("</a>")?;
            }

-            rc.writer.write_all(b"</li>")?;
+            out.write("</li>")?;
        }
        while current_level > 1 {
-            rc.writer.write_all(b"</ol>")?;
-            rc.writer.write_all(b"</li>")?;
+            out.write("</ol>")?;
+            out.write("</li>")?;
            current_level -= 1;
        }

-        rc.writer.write_all(b"</ol>")?;
+        out.write("</ol>")?;
        Ok(())
    }
 }
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -26,8 +26,6 @@ use book::Book;
 use config::Config;
 use errors::*;

-const MDBOOK_VERSION: &str = env!("CARGO_PKG_VERSION");
-
 /// An arbitrary `mdbook` backend.
 ///
 /// Although it's quite possible for you to import `mdbook` as a library and
@@ -66,6 +64,7 @@ pub struct RenderContext {
    /// renderers to cache intermediate results, this directory is not
    /// guaranteed to be empty or even exist.
    pub destination: PathBuf,
+    __non_exhaustive: (),
 }

 impl RenderContext {
@@ -78,9 +77,10 @@ impl RenderContext {
        RenderContext {
            book: book,
            config: config,
-            version: MDBOOK_VERSION.to_string(),
+            version: ::MDBOOK_VERSION.to_string(),
            root: root.into(),
            destination: destination.into(),
+            __non_exhaustive: (),
        }
    }

@@ -157,7 +157,8 @@ impl Renderer for CmdRenderer {

        let _ = fs::create_dir_all(&ctx.destination);

-        let mut child = match self.compose_command()?
+        let mut child = match self
+            .compose_command()?
            .stdin(Stdio::piped())
            .stdout(Stdio::inherit())
            .stderr(Stdio::inherit())
--- a/src/theme/book.js
+++ b/src/theme/book.js
@@ -19,9 +19,16 @@ function playpen_text(playpen) {
    // Hide Rust code lines prepended with a specific character
    var hiding_character = "#";

+    function fetch_with_timeout(url, options, timeout = 6000) {
+        return Promise.race([
+            fetch(url, options),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
+        ]);
+    }
+
    var playpens = Array.from(document.querySelectorAll(".playpen"));
    if (playpens.length > 0) {
-        fetch("https://play.rust-lang.org/meta/crates", {
+        fetch_with_timeout("https://play.rust-lang.org/meta/crates", {
            headers: {
                'Content-Type': "application/json",
            },
@@ -96,33 +103,28 @@ function playpen_text(playpen) {
        let text = playpen_text(code_block);

        var params = {
-            channel: "stable",
-            mode: "debug",
-            crateType: "bin",
-            tests: false,
-            code: text,
-            backtrace: false,
+            version: "stable",
+            optimize: "0",
+            code: text
        };

        if (text.indexOf("#![feature") !== -1) {
-            params.channel = "nightly";
+            params.version = "nightly";
        }

        result_block.innerText = "Running...";

-        var request = fetch("https://play.rust-lang.org/execute", {
+        fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
            headers: {
                'Content-Type': "application/json",
            },
            method: 'POST',
            mode: 'cors',
            body: JSON.stringify(params)
-        });
-
-        request
-            .then(function (response) { return response.json(); })
-            .then(function (response) { result_block.innerText = response.success ? response.stdout : response.stderr; })
-            .catch(function (error) { result_block.innerText = "Playground communication" + error.message; });
+        })
+        .then(response => response.json())
+        .then(response => result_block.innerText = response.result)
+        .catch(error => result_block.innerText = "Playground Communication: " + error.message);
    }

    // Syntax highlighting Configuration
--- a/src/theme/css/variables.css
+++ b/src/theme/css/variables.css
@@ -10,7 +10,7 @@
 /* Themes */

 .ayu {
-    --bg: #0f1419;
+    --bg: hsl(210, 25%, 8%);
    --fg: #c5c5c5;

    --sidebar-bg: #14191f;
@@ -32,12 +32,12 @@
    --theme-popup-border: #5c6773;
    --theme-hover: #191f26;

-    --quote-bg: #262933;
-    --quote-border: lighten(var(--quote-bg), 5%);
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);

-    --table-border-color: lighten(var(--bg), 5%);
-    --table-header-bg: lighten(var(--bg), 20%);
-    --table-alternate-bg: lighten(var(--bg), 3%);
+    --table-border-color: hsl(210, 25%, 13%);
+    --table-header-bg: hsl(210, 25%, 28%);
+    --table-alternate-bg: hsl(210, 25%, 11%);

    --searchbar-border-color: #848484;
    --searchbar-bg: #424242;
@@ -50,7 +50,7 @@
 }

 .coal {
-    --bg: #141617;
+    --bg: hsl(200, 7%, 8%);
    --fg: #98a3ad;

    --sidebar-bg: #292c2f;
@@ -72,12 +72,12 @@
    --theme-popup-border: #43484d;
    --theme-hover: #1f2124;

-    --quote-bg: #242637;
-    --quote-border: lighten(var(--quote-bg), 5%);
+    --quote-bg: hsl(234, 21%, 18%);
+    --quote-border: hsl(234, 21%, 23%);

-    --table-border-color: lighten(var(--bg), 5%);
-    --table-header-bg: lighten(var(--bg), 20%);
-    --table-alternate-bg: lighten(var(--bg), 3%);
+    --table-border-color: hsl(200, 7%, 13%);
+    --table-header-bg: hsl(200, 7%, 28%);
+    --table-alternate-bg: hsl(200, 7%, 11%);

    --searchbar-border-color: #aaa;
    --searchbar-bg: #b7b7b7;
@@ -90,7 +90,7 @@
 }

 .light {
-    --bg: #ffffff;
+    --bg: hsl(0, 0%, 100%);
    --fg: #333333;

    --sidebar-bg: #fafafa;
@@ -112,12 +112,12 @@
    --theme-popup-border: #cccccc;
    --theme-hover: #e6e6e6;

-    --quote-bg: #f2f7f9;
-    --quote-border: darken(var(--quote-bg), 5%);
+    --quote-bg: hsl(197, 37%, 96%);
+    --quote-border: hsl(197, 37%, 91%);

-    --table-border-color: darken(var(--bg), 5%);
-    --table-header-bg: darken(var(--bg), 20%);
-    --table-alternate-bg: darken(var(--bg), 3%);
+    --table-border-color: hsl(0, 0%, 95%);
+    --table-header-bg: hsl(0, 0%, 80%);
+    --table-alternate-bg: hsl(0, 0%, 97%);

    --searchbar-border-color: #aaa;
    --searchbar-bg: #fafafa;
@@ -130,7 +130,7 @@
 }

 .navy {
-    --bg: #161923;
+    --bg: hsl(226, 23%, 11%);
    --fg: #bcbdd0;

    --sidebar-bg: #282d3f;
@@ -152,12 +152,12 @@
    --theme-popup-border: #737480;
    --theme-hover: #282e40;

-    --quote-bg: #262933;
-    --quote-border: lighten(var(--quote-bg), 5%);
+    --quote-bg: hsl(226, 15%, 17%);
+    --quote-border: hsl(226, 15%, 22%);

-    --table-border-color: lighten(var(--bg), 5%);
-    --table-header-bg: lighten(var(--bg), 20%);
-    --table-alternate-bg: lighten(var(--bg), 3%);
+    --table-border-color: hsl(226, 23%, 16%);
+    --table-header-bg: hsl(226, 23%, 31%);
+    --table-alternate-bg: hsl(226, 23%, 14%);

    --searchbar-border-color: #aaa;
    --searchbar-bg: #aeaec6;
@@ -170,7 +170,7 @@
 }

 .rust {
-    --bg: #e1e1db;
+    --bg: hsl(60, 9%, 87%);
    --fg: #262625;

    --sidebar-bg: #3b2e2a;
@@ -192,12 +192,12 @@
    --theme-popup-border: #b38f6b;
    --theme-hover: #99908a;

-    --quote-bg: #c1c1bb;
-    --quote-border: darken(var(--quote-bg), 5%);
+    --quote-bg: hsl(60, 5%, 75%);
+    --quote-border: hsl(60, 5%, 70%);

-    --table-border-color: darken(var(--bg), 5%);
+    --table-border-color: hsl(60, 9%, 82%);
    --table-header-bg: #b3a497;
-    --table-alternate-bg: darken(var(--bg), 3%);
+    --table-alternate-bg: hsl(60, 9%, 84%);

    --searchbar-border-color: #aaa;
    --searchbar-bg: #fafafa;
--- a/src/theme/index.hbs
+++ b/src/theme/index.hbs
@@ -27,7 +27,7 @@

        <!-- Custom theme stylesheets -->
        {{#each additional_css}}
-        <link rel="stylesheet" href="{{ this }}">
+        <link rel="stylesheet" href="{{ ../path_to_root }}{{ this }}">
        {{/each}}

        {{#if mathjax_support}}
@@ -235,7 +235,7 @@

        <!-- Custom JS scripts -->
        {{#each additional_js}}
-        <script type="text/javascript" src="{{ path_to_root }}{{this}}"></script>
+        <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
        {{/each}}

        {{#if is_print}}
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -33,10 +33,10 @@ pub fn normalize_id(content: &str) -> String {
            } else {
                None
            }
-        })
-        .collect::<String>();
+        }).collect::<String>();
    // Ensure that the first character is [A-Za-z]
-    if ret.chars()
+    if ret
+        .chars()
        .next()
        .map_or(false, |c| !c.is_ascii_alphabetic())
    {
@@ -110,7 +110,8 @@ pub fn render_markdown(text: &str, curly_quotes: bool) -> String {

    let p = Parser::new_ext(text, opts);
    let mut converter = EventQuoteConverter::new(curly_quotes);
-    let events = p.map(clean_codeblock_headers)
+    let events = p
+        .map(clean_codeblock_headers)
        .map(adjust_links)
        .map(|event| converter.convert(event));

@@ -192,8 +193,7 @@ fn convert_quotes_to_curly(original_text: &str) -> String {
            preceded_by_whitespace = original_char.is_whitespace();

            converted_char
-        })
-        .collect()
+        }).collect()
 }

 /// Prints a "backtrace" of some `Error`.
--- a/tests/build_process.rs
+++ b/tests/build_process.rs
@@ -0,0 +1,80 @@
+extern crate mdbook;
+
+mod dummy_book;
+
+use dummy_book::DummyBook;
+use mdbook::book::Book;
+use mdbook::config::Config;
+use mdbook::errors::*;
+use mdbook::preprocess::{Preprocessor, PreprocessorContext};
+use mdbook::renderer::{RenderContext, Renderer};
+use mdbook::MDBook;
+use std::sync::{Arc, Mutex};
+
+struct Spy(Arc<Mutex<Inner>>);
+
+#[derive(Debug, Default)]
+struct Inner {
+    run_count: usize,
+    rendered_with: Vec<String>,
+}
+
+impl Preprocessor for Spy {
+    fn name(&self) -> &str {
+        "dummy"
+    }
+
+    fn run(&self, ctx: &PreprocessorContext, book: Book) -> Result<Book> {
+        let mut inner = self.0.lock().unwrap();
+        inner.run_count += 1;
+        inner.rendered_with.push(ctx.renderer.clone());
+        Ok(book)
+    }
+}
+
+impl Renderer for Spy {
+    fn name(&self) -> &str {
+        "dummy"
+    }
+
+    fn render(&self, _ctx: &RenderContext) -> Result<()> {
+        let mut inner = self.0.lock().unwrap();
+        inner.run_count += 1;
+        Ok(())
+    }
+}
+
+#[test]
+fn mdbook_runs_preprocessors() {
+    let spy: Arc<Mutex<Inner>> = Default::default();
+
+    let temp = DummyBook::new().build().unwrap();
+    let cfg = Config::default();
+
+    let mut book = MDBook::load_with_config(temp.path(), cfg).unwrap();
+    book.with_preprecessor(Spy(Arc::clone(&spy)));
+    book.build().unwrap();
+
+    let inner = spy.lock().unwrap();
+    assert_eq!(inner.run_count, 1);
+    assert_eq!(inner.rendered_with.len(), 1);
+    assert_eq!(
+        "html", inner.rendered_with[0],
+        "We should have been run with the default HTML renderer"
+    );
+}
+
+#[test]
+fn mdbook_runs_renderers() {
+    let spy: Arc<Mutex<Inner>> = Default::default();
+
+    let temp = DummyBook::new().build().unwrap();
+    let cfg = Config::default();
+
+    let mut book = MDBook::load_with_config(temp.path(), cfg).unwrap();
+    book.with_renderer(Spy(Arc::clone(&spy)));
+    book.build().unwrap();
+
+    let inner = spy.lock().unwrap();
+    assert_eq!(inner.run_count, 1);
+}
--- a/tests/custom_preprocessors.rs
+++ b/tests/custom_preprocessors.rs
@@ -0,0 +1,53 @@
+extern crate mdbook;
+
+mod dummy_book;
+
+use dummy_book::DummyBook;
+use mdbook::preprocess::{CmdPreprocessor, Preprocessor};
+use mdbook::MDBook;
+
+fn example() -> CmdPreprocessor {
+    CmdPreprocessor::new("nop-preprocessor".to_string(), "cargo run --example nop-preprocessor --".to_string())
+}
+
+#[test]
+fn example_supports_whatever() {
+    let cmd = example();
+
+    let got = cmd.supports_renderer("whatever");
+
+    assert_eq!(got, true);
+}
+
+#[test]
+fn example_doesnt_support_not_supported() {
+    let cmd = example();
+
+    let got = cmd.supports_renderer("not-supported");
+
+    assert_eq!(got, false);
+}
+
+#[test]
+fn ask_the_preprocessor_to_blow_up() {
+    let dummy_book = DummyBook::new();
+    let temp = dummy_book.build().unwrap();
+    let mut md = MDBook::load(temp.path()).unwrap();
+    md.with_preprecessor(example());
+
+    md.config.set("preprocessor.nop-preprocessor.blow-up", true).unwrap();
+
+    let got = md.build();
+
+    assert!(got.is_err());
+}
+
+#[test]
+fn process_the_dummy_book() {
+    let dummy_book = DummyBook::new();
+    let temp = dummy_book.build().unwrap();
+    let mut md = MDBook::load(temp.path()).unwrap();
+    md.with_preprecessor(example());
+
+    md.build().unwrap();
+}
--- a/tests/rendered_output.rs
+++ b/tests/rendered_output.rs
@@ -174,7 +174,8 @@ fn chapter_files_were_rendered_to_html() {
        .filter(|path| path.file_name().and_then(OsStr::to_str) != Some("SUMMARY.md"));

    for chapter in chapter_files {
-        let rendered_location = temp.path()
+        let rendered_location = temp
+            .path()
            .join(chapter.strip_prefix(&src).unwrap())
            .with_extension("html");
        assert!(
@@ -213,7 +214,8 @@ fn check_second_toc_level() {

    let pred = descendants!(Class("chapter"), Name("li"), Name("li"), Name("a"));

-    let mut children_of_children: Vec<_> = doc.find(pred)
+    let mut children_of_children: Vec<_> = doc
+        .find(pred)
        .map(|elem| elem.text().trim().to_string())
        .collect();
    children_of_children.sort();
@@ -231,7 +233,8 @@ fn check_first_toc_level() {

    let pred = descendants!(Class("chapter"), Name("li"), Name("a"));

-    let mut children: Vec<_> = doc.find(pred)
+    let mut children: Vec<_> = doc
+        .find(pred)
        .map(|elem| elem.text().trim().to_string())
        .collect();
    children.sort();
@@ -244,7 +247,8 @@ fn check_spacers() {
    let doc = root_index_html().unwrap();
    let should_be = 1;

-    let num_spacers = doc.find(Class("chapter").descendant(Name("li").and(Class("spacer"))))
+    let num_spacers = doc
+        .find(Class("chapter").descendant(Name("li").and(Class("spacer"))))
        .count();
    assert_eq!(num_spacers, should_be);
 }
--- a/tests/testing.rs
+++ b/tests/testing.rs
@@ -4,14 +4,8 @@ mod dummy_book;

 use dummy_book::DummyBook;

-use mdbook::book::Book;
-use mdbook::config::Config;
-use mdbook::errors::*;
-use mdbook::preprocess::{Preprocessor, PreprocessorContext};
 use mdbook::MDBook;

-use std::sync::{Arc, Mutex};
-
 #[test]
 fn mdbook_can_correctly_test_a_passing_book() {
    let temp = DummyBook::new().with_passing_test(true).build().unwrap();
@@ -27,30 +21,3 @@ fn mdbook_detects_book_with_failing_tests() {

    assert!(md.test(vec![]).is_err());
 }
-
-#[test]
-fn mdbook_runs_preprocessors() {
-    let has_run: Arc<Mutex<bool>> = Arc::new(Mutex::new(false));
-
-    struct DummyPreprocessor(Arc<Mutex<bool>>);
-
-    impl Preprocessor for DummyPreprocessor {
-        fn name(&self) -> &str {
-            "dummy"
-        }
-
-        fn run(&self, _ctx: &PreprocessorContext, _book: &mut Book) -> Result<()> {
-            *self.0.lock().unwrap() = true;
-            Ok(())
-        }
-    }
-
-    let temp = DummyBook::new().build().unwrap();
-    let cfg = Config::default();
-
-    let mut book = MDBook::load_with_config(temp.path(), cfg).unwrap();
-    book.with_preprecessor(DummyPreprocessor(Arc::clone(&has_run)));
-    book.build().unwrap();
-
-    assert!(*has_run.lock().unwrap())
-}
Author	SHA1	Message	Date
Michael Bryan	cffc385b0c	Updated the user guide's config section to mention specifying plugin commands	2018-10-20 14:16:07 +08:00
Michael Bryan	e73928f933	Mentioned plugins in the README	2018-10-20 14:01:51 +08:00
Michael Bryan	29f8b791f1	Merge pull request #792 from rust-lang-nursery/custom-preprocessor WIP: Custom Preprocessors	2018-10-16 00:02:12 +08:00
xyh	877bf37d18	avoid using `cd` in example travis-ci script (#803 )	2018-10-15 18:52:37 +08:00
Michael Bryan	b1c7c54108	Rewrote a large proportion of the Preprocessor docs to be up-to-date	2018-09-25 19:48:20 +08:00
Jan-Erik Rediger	0c926b3e88	Ensure section numbers are correctly incremented after a horizontal separator (#790 ) Fixes #779	2018-09-19 23:33:28 +08:00
mwilbur	e4eddb3f26	Fix broken link to API pages (#795 )	2018-09-19 23:32:37 +08:00
Michael Bryan	adec78e7f5	Forgot to implement 3rd party preprocessor discovery	2018-09-19 23:16:11 +08:00
Michael Bryan	5cd5e4764c	Fleshed out the api docs	2018-09-16 23:44:52 +08:00
Michael Bryan	132f4fd358	Fixed a bug where the tests use the wrong dummy book	2018-09-16 23:33:58 +08:00
Michael Bryan	1d72cea972	The example preprocessor works	2018-09-16 23:28:01 +08:00
Michael Bryan	1aa1194d79	We can shell out to the preprocessor	2018-09-16 23:23:03 +08:00
Michael Bryan	304234c122	The example can now tell mdbook if renderers are supported	2018-09-16 23:00:19 +08:00
Michael Bryan	729c94a7e4	Started working on a custom preprocessor	2018-09-16 22:49:52 +08:00
Ramon Buckland	df874cdbdb	Resolves #270 . details for Clippy and Rustmft usage (#776 ) * Resolves #270. details for Clippy and Rustmft usage * Fix Typo	2018-09-16 14:39:18 +08:00
Michael Bryan	5dce539928	Notify preprocessors of the mdbook version and add __non_exhaustive elements	2018-09-16 14:27:37 +08:00
Michael Bryan	206a00915b	Export the mdbook version from the crate root	2018-09-16 14:22:50 +08:00
Ramon Buckland	ced74ca4dd	Updated the documentation for new preprocessor format (#787 ) * Updated the documentation for new preprocessor format * adjusted the descriptions for preprocessors	2018-09-10 19:51:18 +08:00
Michael Bryan	09667c9956	Configurable preprocessor (#658 ) * The preprocessor trait now returns a modified book instead of editing in place * A preprocessor is told which render it's running for * Made sure preprocessors get their renderer's name * Users can now manually specify whether a preprocessor should run for a renderer * You can normally use default preprocessors by default * Got my logic around the wrong way * Fixed the `build.use-default-preprocessors` flag	2018-09-10 18:55:58 +08:00
Matt Ickstadt	48c97dadd0	Merge pull request #777 from wirelyre/fix-additional-css-and-js Fix paths to additional CSS and JavaScript files	2018-09-04 14:16:42 -04:00
wirelyre	65198a7632	Fix paths to additional CSS and JavaScript files Expressions in an `#each` block need to begin with "../" to reference values in the main context.	2018-08-31 20:03:34 -05:00
Matt Ickstadt	a0e7b19784	(cargo-release) start next development iteration 0.2.2-alpha.0	2018-08-22 08:51:07 -05:00
Matt Ickstadt	7e2e095c26	(cargo-release) version 0.2.1	2018-08-22 08:48:25 -05:00
Matt Ickstadt	5baaf55abc	Merge pull request #770 from mattico/improve-travis Improve CI	2018-08-22 08:55:06 -05:00
Matt Ickstadt	9157f6e32d	Improve CI - Try to get OSX releases working - Use LTO for appveyor releases - Remove unused install.sh	2018-08-21 11:18:20 -05:00
Matt Ickstadt	3688f73052	rustfmt using rustfmt 0.99.2-nightly	2018-08-21 10:58:44 -05:00
Matt Ickstadt	3e89e8b1bd	Update dependencies	2018-08-21 10:51:34 -05:00
Matt Ickstadt	e08fc148b1	Merge pull request #769 from dguo/patch-1 Fix a typo	2018-08-21 09:44:35 -05:00
Danny Guo	d9c1c77aae	Fix a typo	2018-08-20 23:48:18 -04:00
Matt Ickstadt	bb2ca4f938	Merge pull request #765 from weihanglo/fix/quote-table-colors Fix table and quote related color	2018-08-13 11:08:29 -05:00
Weihang Lo	42aded9577	Fix table and quote related color	2018-08-12 02:47:06 +08:00
Matt Ickstadt	7fb2d5437a	Merge pull request #761 from sunng87/feature/handlebars-1.0 Update to handlebars 1.0	2018-08-07 15:39:09 -05:00
Ning Sun	4cc3a1333b	(feat) update to handlebars 1.0	2018-08-05 15:08:47 +08:00
Matt Ickstadt	322e8fcf77	Rewrap guide markdown at 80 columns Much of the book was wrapped at around 80 columns, but let's make this consistent.	2018-08-02 21:34:26 -05:00
Matt Ickstadt	a8a460545f	Update installation instructions in guide	2018-08-02 21:19:47 -05:00
Matt Ickstadt	1d69ccae48	Run rustfmt using 0.8.2-stable included in rustc 1.28.0	2018-08-02 20:22:49 -05:00
Matt Ickstadt	762d89ebbf	(cargo-release) start next development iteration 0.2.1-alpha.0	2018-08-02 19:20:05 -05:00
Matt Ickstadt	91ffca1bbc	(cargo-release) version 0.2.0	2018-08-02 19:17:40 -05:00
Matt Ickstadt	6f963bbe3c	Run AppVeyor on version tags	2018-08-02 19:10:41 -05:00
Matt Ickstadt	93af92910a	Remove travis github_pages deploy Since it doesn't work at the moment and it takes a lot of time.	2018-08-02 19:10:11 -05:00
Matt Ickstadt	f30ce0184d	Fix escaped link preprocessor	2018-08-02 19:04:35 -05:00
Matt Ickstadt	ccb2340fbe	Update dependencies	2018-08-02 17:33:56 -05:00
Matt Ickstadt	bbe6e324d0	Merge pull request #757 from mattico/improve-argparse Improve command-line argument parsing	2018-08-02 17:28:45 -05:00
Matt Ickstadt	a776aa9783	Update documentation for commands	2018-08-02 17:01:47 -05:00
Matt Ickstadt	b8f8e76899	Improve command-line argument parsing	2018-08-02 16:52:41 -05:00
Matt Ickstadt	ac4e00c7c6	Begin development for the 0.2.0 release	2018-08-02 13:31:58 -05:00
Matt Ickstadt	67fde37030	Merge pull request #756 from mattico/test-dir Fix relative paths in index.html	2018-08-02 13:12:34 -05:00
Matt Ickstadt	b2eb1ace08	Fix relative paths in index.html	2018-08-02 12:43:40 -05:00
Matt Ickstadt	b5fd170008	Merge pull request #755 from mattico/test-dir Add directory argument to `mdbook test`	2018-08-01 23:11:32 -05:00
Matt Ickstadt	b3665c287d	Add directory argument to `mdbook test`	2018-08-01 17:59:40 -05:00
Matt Ickstadt	436c084b9e	Merge pull request #754 from mattico/playpen-api Use stable rust playground API	2018-08-01 15:22:06 -05:00
Matt Ickstadt	47f85e71a8	Use stable rust playground API and also add timeouts to these fetches.	2018-08-01 12:38:36 -05:00
Matt Ickstadt	1d448fc8cc	(cargo-release) start next development iteration 0.1.11-alpha.0	2018-07-30 19:23:20 -05:00