From 03681b16ce1fd5c36069363ef8134f36b01a9022 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Mon, 25 Jan 2016 18:34:34 +0000 Subject: [PATCH 1/2] Fix link to hello-cargo in the book It was moved in #29538. --- src/doc/book/error-handling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/book/error-handling.md b/src/doc/book/error-handling.md index 9b1d16170b9..40891dbe191 100644 --- a/src/doc/book/error-handling.md +++ b/src/doc/book/error-handling.md @@ -1512,7 +1512,7 @@ and [`rustc-serialize`](https://crates.io/crates/rustc-serialize) crates. We're not going to spend a lot of time on setting up a project with Cargo because it is already covered well in [the Cargo -section](../book/hello-cargo.html) and [Cargo's documentation][14]. +section](getting-started.html#hello-cargo) and [Cargo's documentation][14]. To get started from scratch, run `cargo new --bin city-pop` and make sure your `Cargo.toml` looks something like this: From ace39cbc15488eb949ef4dc13a10137b170709b1 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Mon, 25 Jan 2016 18:40:28 +0000 Subject: [PATCH 2/2] Replace link to learn-rust in the book It was removed in #30595. Also delete the old learn-rust.md. --- src/doc/book/getting-started.md | 6 +++--- src/doc/book/learn-rust.md | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 src/doc/book/learn-rust.md diff --git a/src/doc/book/getting-started.md b/src/doc/book/getting-started.md index 77d468254b6..ed4d7cc40be 100644 --- a/src/doc/book/getting-started.md +++ b/src/doc/book/getting-started.md @@ -604,11 +604,11 @@ This chapter covered the basics that will serve you well through the rest of this book, and the rest of your time with Rust. Now that you’ve got the tools down, we'll cover more about the Rust language itself. -You have two options: Dive into a project with ‘[Learn Rust][learnrust]’, or +You have two options: Dive into a project with ‘[Tutorial: Guessing Game][guessinggame]’, or start from the bottom and work your way up with ‘[Syntax and Semantics][syntax]’. More experienced systems programmers will probably prefer -‘Learn Rust’, while those from dynamic backgrounds may enjoy either. Different +‘Tutorial: Guessing Game’, while those from dynamic backgrounds may enjoy either. Different people learn differently! Choose whatever’s right for you. -[learnrust]: learn-rust.html +[guessinggame]: guessing-game.html [syntax]: syntax-and-semantics.html diff --git a/src/doc/book/learn-rust.md b/src/doc/book/learn-rust.md deleted file mode 100644 index 7be7fa4f039..00000000000 --- a/src/doc/book/learn-rust.md +++ /dev/null @@ -1,9 +0,0 @@ -% Learn Rust - -Welcome! This chapter has a few tutorials that teach you Rust through building -projects. You’ll get a high-level overview, but we’ll skim over the details. - -If you’d prefer a more ‘from the ground up’-style experience, check -out [Syntax and Semantics][ss]. - -[ss]: syntax-and-semantics.html