diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:50 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 10:07:50 -0700 |
| commit | 19ed61eabd5bb61efa2bfe6384f409afc232c8b6 (patch) | |
| tree | 1250cc3d80a3cb22b9bd6b6c98fd18338fe58f3a /src | |
| parent | 625199950caa7ed5de67ba74ed68789e89f4a17e (diff) | |
| parent | 4357621ca99fe33f6159c4138a1cffb64c5062b2 (diff) | |
| download | rust-19ed61eabd5bb61efa2bfe6384f409afc232c8b6.tar.gz rust-19ed61eabd5bb61efa2bfe6384f409afc232c8b6.zip | |
rollup merge of #23764: tshepang/no-guessing-anymore
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/trpl/README.md | 3 | ||||
| -rw-r--r-- | src/doc/trpl/arrays-vectors-and-slices.md | 6 | ||||
| -rw-r--r-- | src/doc/trpl/basic.md | 3 | ||||
| -rw-r--r-- | src/doc/trpl/compound-data-types.md | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/doc/trpl/README.md b/src/doc/trpl/README.md index f5dd92f5a3d..4a866d6224d 100644 --- a/src/doc/trpl/README.md +++ b/src/doc/trpl/README.md @@ -11,8 +11,7 @@ navigate through the menu on the left. <h2 class="section-header"><a href="basic.html">Basics</a></h2> This section is a linear introduction to the basic syntax and semantics of -Rust. It has individual sections on each part of Rust's syntax, and culminates -in a small project: a guessing game. +Rust. It has individual sections on each part of Rust's syntax. After reading "Basics," you will have a good foundation to learn more about Rust, and can write very simple programs. diff --git a/src/doc/trpl/arrays-vectors-and-slices.md b/src/doc/trpl/arrays-vectors-and-slices.md index 5d0f314e8c6..fb56e4a6767 100644 --- a/src/doc/trpl/arrays-vectors-and-slices.md +++ b/src/doc/trpl/arrays-vectors-and-slices.md @@ -99,7 +99,5 @@ You can also take a slice of a vector, `String`, or `&str`, because they are backed by arrays. Slices have type `&[T]`, which we'll talk about when we cover generics. -We have now learned all of the most basic Rust concepts. We're ready to start -building ourselves a guessing game, we just need to know one last thing: how to -get input from the keyboard. You can't have a guessing game without the ability -to guess! +We have now learned all of the most basic Rust concepts. Next, we learn how to +get input from the keyboard. diff --git a/src/doc/trpl/basic.md b/src/doc/trpl/basic.md index 087121d0e7d..c267830e6e0 100644 --- a/src/doc/trpl/basic.md +++ b/src/doc/trpl/basic.md @@ -1,8 +1,7 @@ % Basics This section is a linear introduction to the basic syntax and semantics of -Rust. It has individual sections on each part of Rust's syntax, and cumulates -in a small project: a guessing game. +Rust. It has individual sections on each part of Rust's syntax. After reading "Basics," you will have a good foundation to learn more about Rust, and can write very simple programs. diff --git a/src/doc/trpl/compound-data-types.md b/src/doc/trpl/compound-data-types.md index d531a22d0e0..e44d2edd667 100644 --- a/src/doc/trpl/compound-data-types.md +++ b/src/doc/trpl/compound-data-types.md @@ -361,5 +361,4 @@ and brittle `if`/`else`s. [arity]: ./glossary.html#arity [match]: ./match.html -[game]: ./guessing-game.html#comparing-guesses [generics]: ./generics.html |