Skip to content

Commit

Permalink
Auto merge of #42661 - steveklabnik:gh42660-beta, r=alexcrichton
Browse files Browse the repository at this point in the history 
[beta] update book with redirect fixes

Backport of #42660

Requesting a backport because people are finding this very confusing. I could in theory make this smaller but it's a real giant pain, so just update the entire book rather than creating a `nodelete` branch that lives forever in the book repo.

r? @brson @alexcrichton
  • Loading branch information
@bors
bors committed Jun 18, 2017
2 parents a175ee5 + cba129b commit 4795a8f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 84 files
+1 −6 .travis.yml
+0 −50 ci/deploy.sh
+1 −1 first-edition/src/iterators.md
+5 −5 first-edition/src/procedural-macros.md
+3 −1 first-edition/src/the-stack-and-the-heap.md
+8 −10 redirects/README.md
+8 −10 redirects/SUMMARY.md
+9 −10 redirects/associated-types.md
+9 −10 redirects/attributes.md
+9 −10 redirects/bibliography.md
+9 −10 redirects/borrow-and-asref.md
+9 −10 redirects/casting-between-types.md
+9 −10 redirects/choosing-your-guarantees.md
+9 −10 redirects/closures.md
+9 −10 redirects/comments.md
+9 −10 redirects/concurrency.md
+9 −10 redirects/conditional-compilation.md
+9 −10 redirects/const-and-static.md
+9 −10 redirects/crates-and-modules.md
+9 −10 redirects/deref-coercions.md
+9 −10 redirects/documentation.md
+9 −10 redirects/drop.md
+9 −10 redirects/effective-rust.md
+9 −10 redirects/enums.md
+9 −10 redirects/error-handling.md
+9 −10 redirects/ffi.md
+9 −10 redirects/functions.md
+9 −10 redirects/generics.md
+9 −10 redirects/getting-started.md
+9 −10 redirects/glossary.md
+9 −10 redirects/guessing-game.md
+9 −10 redirects/if-let.md
+9 −10 redirects/if.md
+9 −10 redirects/iterators.md
+9 −10 redirects/lifetimes.md
+9 −10 redirects/loops.md
+9 −10 redirects/macros.md
+9 −10 redirects/match.md
+9 −10 redirects/method-syntax.md
+9 −10 redirects/mutability.md
+9 −10 redirects/operators-and-overloading.md
+9 −10 redirects/ownership.md
+9 −10 redirects/patterns.md
+9 −10 redirects/primitive-types.md
+9 −10 redirects/procedural-macros.md
+9 −10 redirects/raw-pointers.md
+9 −10 redirects/references-and-borrowing.md
+9 −10 redirects/release-channels.md
+9 −10 redirects/strings.md
+9 −10 redirects/structs.md
+9 −10 redirects/syntax-and-semantics.md
+9 −10 redirects/syntax-index.md
+9 −10 redirects/testing.md
+9 −10 redirects/the-stack-and-the-heap.md
+9 −10 redirects/trait-objects.md
+9 −10 redirects/traits.md
+9 −10 redirects/type-aliases.md
+9 −10 redirects/ufcs.md
+9 −10 redirects/unsafe.md
+9 −10 redirects/unsized-types.md
+9 −10 redirects/using-rust-without-the-standard-library.md
+9 −10 redirects/variable-bindings.md
+9 −10 redirects/vectors.md
+4 −1 second-edition/dictionary.txt
+1 −1 second-edition/nostarch/chapter05.md
+371 −389 second-edition/nostarch/chapter07.md
+ − second-edition/nostarch/odt/chapter05.docx
+ − second-edition/nostarch/odt/chapter07.docx
+25 −1 second-edition/src/appendix-07-newest-features.md
+10 −1 second-edition/src/ch01-02-hello-world.md
+2 −2 second-edition/src/ch03-01-variables-and-mutability.md
+1 −1 second-edition/src/ch03-02-data-types.md
+1 −1 second-edition/src/ch05-01-defining-structs.md
+15 −15 second-edition/src/ch07-00-modules.md
+145 −133 second-edition/src/ch07-01-mod-and-the-filesystem.md
+79 −76 second-edition/src/ch07-02-controlling-visibility-with-pub.md
+52 −48 second-edition/src/ch07-03-importing-names-with-use.md
+5 −13 second-edition/src/ch12-03-improving-error-handling-and-modularity.md
+7 −9 second-edition/src/ch12-05-working-with-environment-variables.md
+2 −2 second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md
+2 −2 second-edition/src/ch14-02-publishing-to-crates-io.md
+8 −6 second-edition/src/ch19-01-unsafe-rust.md
+3 −2 second-edition/src/ch19-03-advanced-traits.md
+2 −5 second-edition/tools/docx-to-md.xsl

0 comments on commit 4795a8f

Please sign in to comment.