Skip to content

Commit 268e360

Browse files
committed
Rollup merge of rust-lang#29538 - steveklabnik:ch1_edits, r=brson
I did some preliminary editing work with No Starch on the first chapter of the book, and here's some of the results. We're going to want to return to this later when @brson etc's new rustup work is done, so this is mostly just a first pass. But, we agreed that having separate chapters for each of this bit of intro is a bit excessive. So let's move all of this intro stuff into one chapter. I'd appreciate a careful review of this, as there was also some confusion about some things, which resulted in me taking one huge markdown file apart and splitting it back up, as well as some editor issues, so I _think_ this looks good, but double checking things matters! /cc @aturon
2 parents dd53c83 + 7bb193c commit 268e360

File tree

5 files changed

+605
-568
lines changed

5 files changed

+605
-568
lines changed

src/doc/trpl/SUMMARY.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Summary
22

33
* [Getting Started](getting-started.md)
4-
* [Installing Rust](installing-rust.md)
5-
* [Hello, world!](hello-world.md)
6-
* [Hello, Cargo!](hello-cargo.md)
74
* [Learn Rust](learn-rust.md)
85
* [Guessing Game](guessing-game.md)
96
* [Dining Philosophers](dining-philosophers.md)

0 commit comments

Comments
 (0)