Merge pull request rust-lang#641 from ehuss/mdbook-0.3

Update to mdbook 0.3.

Author: matthewjasper

.travis.yml

@@ -4,7 +4,7 @@ rust:
   - nightly
 
 install:
-  - travis_retry curl -Lf https://github.com/rust-lang-nursery/mdBook/releases/download/v0.1.7/mdbook-v0.1.7-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=$HOME/.cargo/bin
+  - travis_retry curl -Lf https://github.com/rust-lang-nursery/mdBook/releases/download/v0.3.1/mdbook-v0.3.1-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=$HOME/.cargo/bin
 
 script:
   - export PATH=$PATH:/home/travis/.cargo/bin && mdbook test

book.toml

@@ -4,5 +4,5 @@ title = "The Rust Reference"
 author = "The Rust Project Developers"
 
 [output.html]
-
-additional-css = ["src/theme/reference.css"]
+additional-css = ["theme/reference.css"]
+git-repository-url = "https://github.com/rust-lang-nursery/reference/"

src/abi.md

@@ -85,11 +85,11 @@ to specify the symbol name.
 pub fn name_in_rust() { }
 ```
 
-[_MetaNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[`static` items]: items/static-items.html
-[attribute]: attributes.html
-[extern functions]: items/functions.html#extern-functions
-[external blocks]: items/external-blocks.html
-[function]: items/functions.html
-[item]: items.html
-[static]: items/static-items.html
+[_MetaNameValueStr_]: attributes.md#meta-item-attribute-syntax
+[`static` items]: items/static-items.md
+[attribute]: attributes.md
+[extern functions]: items/functions.md#extern-functions
+[external blocks]: items/external-blocks.md
+[function]: items/functions.md
+[item]: items.md
+[static]: items/static-items.md

src/attributes.md

@@ -237,72 +237,72 @@ The following is an index of all built-in attributes.
   - `feature` — Used to enable unstable or experimental compiler features. See
     [The Unstable Book] for features implemented in `rustc`.
 
-[Doc comments]: comments.html#doc-comments
+[Doc comments]: comments.md#doc-comments
 [ECMA-334]: https://www.ecma-international.org/publications/standards/Ecma-334.htm
 [ECMA-335]: https://www.ecma-international.org/publications/standards/Ecma-335.htm
-[Expression Attributes]: expressions.html#expression-attributes
-[IDENTIFIER]: identifiers.html
-[RAW_STRING_LITERAL]: tokens.html#raw-string-literals
-[STRING_LITERAL]: tokens.html#string-literals
+[Expression Attributes]: expressions.md#expression-attributes
+[IDENTIFIER]: identifiers.md
+[RAW_STRING_LITERAL]: tokens.md#raw-string-literals
+[STRING_LITERAL]: tokens.md#string-literals
 [The Rustdoc Book]: ../rustdoc/the-doc-attribute.html
 [The Unstable Book]: ../unstable-book/index.html
-[_DelimTokenTree_]: macros.html
-[_LiteralExpression_]: expressions/literal-expr.html
-[_SimplePath_]: paths.html#simple-paths
-[`allow`]: attributes/diagnostics.html#lint-check-attributes
-[`cfg_attr`]: conditional-compilation.html#the-cfg_attr-attribute
-[`cfg`]: conditional-compilation.html#the-cfg-attribute
-[`cold`]: attributes/codegen.html#the-cold-attribute
-[`crate_name`]: crates-and-source-files.html#the-crate_name-attribute
-[`crate_type`]: linkage.html
-[`deny`]: attributes/diagnostics.html#lint-check-attributes
-[`deprecated`]: attributes/diagnostics.html#the-deprecated-attribute
-[`derive`]: attributes/derive.html
-[`export_name`]: abi.html#the-export_name-attribute
-[`forbid`]: attributes/diagnostics.html#lint-check-attributes
-[`global_allocator`]: runtime.html#the-global_allocator-attribute
-[`ignore`]: attributes/testing.html#the-ignore-attribute
-[`inline`]: attributes/codegen.html#the-inline-attribute
-[`link_name`]: items/external-blocks.html#the-link_name-attribute
-[`link_section`]: abi.html#the-link_section-attribute
-[`link`]: items/external-blocks.html#the-link-attribute
-[`macro_export`]: macros-by-example.html#path-based-scope
-[`macro_use`]: macros-by-example.html#the-macro_use-attribute
-[`meta` macro fragment specifier]: macros-by-example.html
-[`must_use`]: attributes/diagnostics.html#the-must_use-attribute
-[`no_builtins`]: attributes/codegen.html#the-no_builtins-attribute
-[`no_implicit_prelude`]: items/modules.html#prelude-items
-[`no_link`]: items/extern-crates.html#the-no_link-attribute
-[`no_main`]: crates-and-source-files.html#the-no_main-attribute
-[`no_mangle`]: abi.html#the-no_mangle-attribute
-[`no_std`]: crates-and-source-files.html#preludes-and-no_std
-[`panic_handler`]: runtime.html#the-panic_handler-attribute
-[`path`]: items/modules.html#the-path-attribute
-[`proc_macro_attribute`]: procedural-macros.html#attribute-macros
-[`proc_macro_derive`]: procedural-macros.html#derive-macros
-[`proc_macro`]: procedural-macros.html#function-like-procedural-macros
-[`recursion_limit`]: attributes/limits.html#the-recursion_limit-attribute
-[`repr`]: type-layout.html#representations
-[`should_panic`]: attributes/testing.html#the-should_panic-attribute
-[`target_feature`]: attributes/codegen.html#the-target_feature-attribute
-[`test`]: attributes/testing.html#the-test-attribute
-[`type_length_limit`]: attributes/limits.html#the-type_length_limit-attribute
-[`used`]: abi.html#the-used-attribute
-[`warn`]: attributes/diagnostics.html#lint-check-attributes
-[`windows_subsystem`]: runtime.html#the-windows_subsystem-attribute
-[attribute macros]: procedural-macros.html#attribute-macros
-[block expressions]: expressions/block-expr.html
+[_DelimTokenTree_]: macros.md
+[_LiteralExpression_]: expressions/literal-expr.md
+[_SimplePath_]: paths.md#simple-paths
+[`allow`]: attributes/diagnostics.md#lint-check-attributes
+[`cfg_attr`]: conditional-compilation.md#the-cfg_attr-attribute
+[`cfg`]: conditional-compilation.md#the-cfg-attribute
+[`cold`]: attributes/codegen.md#the-cold-attribute
+[`crate_name`]: crates-and-source-files.md#the-crate_name-attribute
+[`crate_type`]: linkage.md
+[`deny`]: attributes/diagnostics.md#lint-check-attributes
+[`deprecated`]: attributes/diagnostics.md#the-deprecated-attribute
+[`derive`]: attributes/derive.md
+[`export_name`]: abi.md#the-export_name-attribute
+[`forbid`]: attributes/diagnostics.md#lint-check-attributes
+[`global_allocator`]: runtime.md#the-global_allocator-attribute
+[`ignore`]: attributes/testing.md#the-ignore-attribute
+[`inline`]: attributes/codegen.md#the-inline-attribute
+[`link_name`]: items/external-blocks.md#the-link_name-attribute
+[`link_section`]: abi.md#the-link_section-attribute
+[`link`]: items/external-blocks.md#the-link-attribute
+[`macro_export`]: macros-by-example.md#path-based-scope
+[`macro_use`]: macros-by-example.md#the-macro_use-attribute
+[`meta` macro fragment specifier]: macros-by-example.md
+[`must_use`]: attributes/diagnostics.md#the-must_use-attribute
+[`no_builtins`]: attributes/codegen.md#the-no_builtins-attribute
+[`no_implicit_prelude`]: items/modules.md#prelude-items
+[`no_link`]: items/extern-crates.md#the-no_link-attribute
+[`no_main`]: crates-and-source-files.md#the-no_main-attribute
+[`no_mangle`]: abi.md#the-no_mangle-attribute
+[`no_std`]: crates-and-source-files.md#preludes-and-no_std
+[`panic_handler`]: runtime.md#the-panic_handler-attribute
+[`path`]: items/modules.md#the-path-attribute
+[`proc_macro_attribute`]: procedural-macros.md#attribute-macros
+[`proc_macro_derive`]: procedural-macros.md#derive-macros
+[`proc_macro`]: procedural-macros.md#function-like-procedural-macros
+[`recursion_limit`]: attributes/limits.md#the-recursion_limit-attribute
+[`repr`]: type-layout.md#representations
+[`should_panic`]: attributes/testing.md#the-should_panic-attribute
+[`target_feature`]: attributes/codegen.md#the-target_feature-attribute
+[`test`]: attributes/testing.md#the-test-attribute
+[`type_length_limit`]: attributes/limits.md#the-type_length_limit-attribute
+[`used`]: abi.md#the-used-attribute
+[`warn`]: attributes/diagnostics.md#lint-check-attributes
+[`windows_subsystem`]: runtime.md#the-windows_subsystem-attribute
+[attribute macros]: procedural-macros.md#attribute-macros
+[block expressions]: expressions/block-expr.md
 [built-in attributes]: #built-in-attributes-index
-[derive macro helper attributes]: procedural-macros.html#derive-macro-helper-attributes
-[enum]: items/enumerations.html
-[expression statement]: statements.html#expression-statements
-[external blocks]: items/external-blocks.html
-[functions]: items/functions.html
-[generics]: items/generics.html
-[implementations]: items/implementations.html
-[item declarations]: items.html
-[match expressions]: expressions/match-expr.html
-[modules]: items/modules.html
-[statements]: statements.html
-[struct]: items/structs.html
-[union]: items/unions.html
+[derive macro helper attributes]: procedural-macros.md#derive-macro-helper-attributes
+[enum]: items/enumerations.md
+[expression statement]: statements.md#expression-statements
+[external blocks]: items/external-blocks.md
+[functions]: items/functions.md
+[generics]: items/generics.md
+[implementations]: items/implementations.md
+[item declarations]: items.md
+[match expressions]: expressions/match-expr.md
+[modules]: items/modules.md
+[statements]: statements.md
+[struct]: items/structs.md
+[union]: items/unions.md

src/attributes/codegen.md

@@ -139,15 +139,15 @@ feature detection on the x86 platforms.
 > may be enabled or disabled for an entire crate with the
 > [`-C target-feature`] flag.
 
-[_MetaListNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[`-C target-cpu`]: ../rustc/codegen-options/index.html#target-cpu
-[`-C target-feature`]: ../rustc/codegen-options/index.html#target-feature
-[`is_x86_feature_detected`]: ../std/macro.is_x86_feature_detected.html
-[`target_feature` conditional compilation option]: conditional-compilation.html#target_feature
-[attribute]: attributes.html
-[attributes]: attributes.html
-[functions]: items/functions.html
-[target architecture]: conditional-compilation.html#target_arch
-[trait]: items/traits.html
-[undefined behavior]: behavior-considered-undefined.html
-[unsafe function]: unsafe-functions.html
+[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[`-C target-cpu`]: ../../rustc/codegen-options/index.html#target-cpu
+[`-C target-feature`]: ../../rustc/codegen-options/index.html#target-feature
+[`is_x86_feature_detected`]: ../../std/macro.is_x86_feature_detected.html
+[`target_feature` conditional compilation option]: ../conditional-compilation.md#target_feature
+[attribute]: ../attributes.md
+[attributes]: ../attributes.md
+[functions]: ../items/functions.md
+[target architecture]: ../conditional-compilation.md#target_arch
+[trait]: ../items/traits.md
+[undefined behavior]: ../behavior-considered-undefined.md
+[unsafe function]: ../unsafe-functions.md

src/attributes/derive.md

@@ -33,10 +33,10 @@ impl<T: PartialEq> PartialEq for Foo<T> {
 
 You can implement `derive` for your own traits through [procedural macros].
 
-[_MetaListPaths_]: attributes.html#meta-item-attribute-syntax
-[`Clone`]: ../std/clone/trait.Clone.html
-[`PartialEq`]: ../std/cmp/trait.PartialEq.html
-[`impl` item]: items/implementations.html
-[items]: items.html
-[derive macros]: procedural-macros.html#derive-macros
-[procedural macros]: procedural-macros.html#derive-macros
+[_MetaListPaths_]: ../attributes.md#meta-item-attribute-syntax
+[`Clone`]: ../../std/clone/trait.Clone.html
+[`PartialEq`]: ../../std/cmp/trait.PartialEq.html
+[`impl` item]: ../items/implementations.md
+[items]: ../items.md
+[derive macros]: ../procedural-macros.md#derive-macros
+[procedural macros]: ../procedural-macros.md#derive-macros

src/attributes/diagnostics.md

@@ -253,29 +253,29 @@ When used on a function in a trait implementation, the attribute does nothing.
 > ```
 
 [Clippy]: https://github.com/rust-lang/rust-clippy
-[_MetaListNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[_MetaListPaths_]: attributes.html#meta-item-attribute-syntax
-[_MetaNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[`Drop`]: special-types-and-traits.html#drop
-[attributes]: attributes.html
-[block expression]: expressions/block-expr.html
-[call expression]: expressions/call-expr.html
-[enum variant]: items/enumerations.html
-[enum]: items/enumerations.html
-[expression statement]: statements.html#expression-statements
-[expression]: expressions.html
-[external block item]: items/external-blocks.html
-[functions]: items/functions.html
-[impl trait]: types/impl-trait.html
-[implementation]: items/implementations.html
-[item]: items.html
-[let statement]: statements.html#let-statements
-[module]: items/modules.html
-[rustc book]: ../rustc/lints/index.html
-[struct field]: items/structs.html
-[struct]: items/structs.html
-[trait declaration]: items/traits.html
-[trait implementation items]: items/implementations.html#trait-implementations
-[trait item]: items/traits.html
-[traits]: items/traits.html
-[union]: items/unions.html
+[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[_MetaListPaths_]: ../attributes.md#meta-item-attribute-syntax
+[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[`Drop`]: ../special-types-and-traits.md#drop
+[attributes]: ../attributes.md
+[block expression]: ../expressions/block-expr.md
+[call expression]: ../expressions/call-expr.md
+[enum variant]: ../items/enumerations.md
+[enum]: ../items/enumerations.md
+[expression statement]: ../statements.md#expression-statements
+[expression]: ../expressions.md
+[external block item]: ../items/external-blocks.md
+[functions]: ../items/functions.md
+[impl trait]: ../types/impl-trait.md
+[implementation]: ../items/implementations.md
+[item]: ../items.md
+[let statement]: ../statements.md#let-statements
+[module]: ../items/modules.md
+[rustc book]: ../../rustc/lints/index.html
+[struct field]: ../items/structs.md
+[struct]: ../items/structs.md
+[trait declaration]: ../items/traits.md
+[trait implementation items]: ../items/implementations.md#trait-implementations
+[trait item]: ../items/traits.md
+[traits]: ../items/traits.md
+[union]: ../items/unions.md

src/attributes/limits.md

@@ -57,6 +57,6 @@ fn f<T>(x: T) {}
 f((1, 2, 3, 4, 5, 6, 7, 8, 9));
 ```
 
-[_MetaNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[attributes]: attributes.html
-[crate]: crates-and-source-files.html
+[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[attributes]: ../attributes.md
+[crate]: ../crates-and-source-files.md

src/attributes/testing.md

@@ -82,8 +82,8 @@ fn mytest() {
 }
 ```
 
-[_MetaListNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[_MetaNameValueStr_]: attributes.html#meta-item-attribute-syntax
-[`Termination`]: ../std/process/trait.Termination.html
-[`test` conditional compilation option]: conditional-compilation.html#test
-[attributes]: attributes.html
+[_MetaListNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[_MetaNameValueStr_]: ../attributes.md#meta-item-attribute-syntax
+[`Termination`]: ../../std/process/trait.Termination.html
+[`test` conditional compilation option]: ../conditional-compilation.md#test
+[attributes]: ../attributes.md

src/behavior-considered-undefined.md

@@ -52,7 +52,7 @@ code.
 [undef]: http://llvm.org/docs/LangRef.html#undefined-values
 [`offset`]: ../std/primitive.pointer.html#method.offset
 [`std::ptr::copy_nonoverlapping_memory`]: ../std/ptr/fn.copy_nonoverlapping.html
-[`target_feature`]: attributes/codegen.html#the-target_feature-attribute
+[`target_feature`]: attributes/codegen.md#the-target_feature-attribute
 [`UnsafeCell<U>`]: ../std/cell/struct.UnsafeCell.html
 [`read_unaligned`]: ../std/ptr/fn.read_unaligned.html
 [`write_unaligned`]: ../std/ptr/fn.write_unaligned.html

src/conditional-compilation.md

@@ -310,19 +310,19 @@ let machine_kind = if cfg!(unix) {
 println!("I'm running on a {} machine!", machine_kind);
 ```
 
-[IDENTIFIER]: identifiers.html
-[RAW_STRING_LITERAL]: tokens.html#raw-string-literals
-[STRING_LITERAL]: tokens.html#string-literals
-[Testing]: attributes/testing.html
-[_Attr_]: attributes.html
-[`--cfg`]: ../rustc/command-line-arguments.html#a--cfg-configure-the-compilation-environment
-[`--test`]: ../rustc/command-line-arguments.html#a--test-build-a-test-harness
+[IDENTIFIER]: identifiers.md
+[RAW_STRING_LITERAL]: tokens.md#raw-string-literals
+[STRING_LITERAL]: tokens.md#string-literals
+[Testing]: attributes/testing.md
+[_Attr_]: attributes.md
+[`--cfg`]: ../rustc/command-line-arguments.html#--cfg-configure-the-compilation-environment
+[`--test`]: ../rustc/command-line-arguments.html#--test-build-a-test-harness
 [`cfg`]: #the-cfg-attribute
 [`cfg` macro]: #the-cfg-macro
 [`cfg_attr`]: #the-cfg_attr-attribute
 [`debug_assert!`]: ../std/macro.debug_assert.html
-[`target_feature` attribute]: attributes/codegen.html#the-target_feature-attribute
-[attribute]: attributes.html
-[attributes]: attributes.html
-[crate type]: linkage.html
-[static C runtime]: linkage.html#static-and-dynamic-c-runtimes
+[`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute
+[attribute]: attributes.md
+[attributes]: attributes.md
+[crate type]: linkage.md
+[static C runtime]: linkage.md#static-and-dynamic-c-runtimes