Skip to content

Commit

Permalink
Auto merge of #45555 - integer32llc:update-beta-book, r=steveklabnik
Browse files Browse the repository at this point in the history
Update the book on beta to fix the print button

Connects to #45552.

This does bring in changes to the text that we've made since beta branched, since we usually update the book just before beta goes to stable anyway, I didn't think this was a problem. If it is, I will happily make a branch of the book with just the print button fix and send in that instead!

r? @steveklabnik
  • Loading branch information
bors committed Oct 27, 2017
2 parents f724781 + 9d8320b commit 49d5276
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/doc/book
Submodule book updated 46 files
+4 −2 README.md
+3 −0 second-edition/dictionary.txt
+90 −86 second-edition/nostarch/chapter02.md
+148 −148 second-edition/nostarch/chapter03.md
+426 −671 second-edition/nostarch/chapter13.md
+89 −203 second-edition/nostarch/chapter14.md
+649 −484 second-edition/nostarch/chapter16.md
+ second-edition/nostarch/odt/chapter13.docx
+ second-edition/nostarch/odt/chapter14.docx
+4 −4 second-edition/src/ch01-02-hello-world.md
+24 −17 second-edition/src/ch02-00-guessing-game-tutorial.md
+2 −0 second-edition/src/ch03-01-variables-and-mutability.md
+13 −10 second-edition/src/ch03-02-data-types.md
+17 −15 second-edition/src/ch03-03-how-functions-work.md
+2 −1 second-edition/src/ch03-04-comments.md
+10 −4 second-edition/src/ch03-05-control-flow.md
+2 −2 second-edition/src/ch05-01-defining-structs.md
+1 −1 second-edition/src/ch05-02-example-structs.md
+1 −1 second-edition/src/ch05-03-method-syntax.md
+3 −3 second-edition/src/ch06-02-match.md
+1 −1 second-edition/src/ch07-00-modules.md
+1 −1 second-edition/src/ch07-01-mod-and-the-filesystem.md
+1 −1 second-edition/src/ch07-03-importing-names-with-use.md
+9 −9 second-edition/src/ch10-02-traits.md
+4 −4 second-edition/src/ch10-03-lifetime-syntax.md
+1 −1 second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md
+6 −11 second-edition/src/ch13-00-functional-features.md
+280 −381 second-edition/src/ch13-01-closures.md
+124 −206 second-edition/src/ch13-02-iterators.md
+34 −74 second-edition/src/ch13-03-improving-our-io-project.md
+11 −32 second-edition/src/ch13-04-performance.md
+1 −4 second-edition/src/ch14-00-more-about-cargo.md
+13 −57 second-edition/src/ch14-01-release-profiles.md
+54 −98 second-edition/src/ch14-02-publishing-to-crates-io.md
+18 −38 second-edition/src/ch14-03-cargo-workspaces.md
+2 −5 second-edition/src/ch14-04-installing-binaries.md
+52 −36 second-edition/src/ch16-00-concurrency.md
+180 −117 second-edition/src/ch16-01-threads.md
+161 −86 second-edition/src/ch16-02-message-passing.md
+190 −177 second-edition/src/ch16-03-shared-state.md
+61 −64 second-edition/src/ch16-04-extensible-concurrency-sync-and-send.md
+1 −1 second-edition/src/ch18-01-all-the-places-for-patterns.md
+2 −2 second-edition/src/ch18-02-refutability.md
+10 −24 second-edition/src/ch20-06-graceful-shutdown-and-cleanup.md
+13 −3 second-edition/theme/index.hbs
+3 −3 second-edition/tools/docx-to-md.xsl

0 comments on commit 49d5276

Please sign in to comment.