From 172d321f9fc56aa008f48f82d79dea85b620231e Mon Sep 17 00:00:00 2001 From: Vanja Cosic Date: Sun, 18 Sep 2016 14:16:42 +0200 Subject: [PATCH 1/2] Updated "Getting started". Trying to fix #34523 - Updated paragraphs and wording for clarity. - Renamed `helloworld.rs` to `myprogram.rs` to make it clearer that it's an unrelated example. --- src/doc/book/getting-started.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/doc/book/getting-started.md b/src/doc/book/getting-started.md index 700ab2be58932..91e25e81026b8 100644 --- a/src/doc/book/getting-started.md +++ b/src/doc/book/getting-started.md @@ -230,12 +230,13 @@ $ cd hello_world ## Writing and Running a Rust Program -Next, make a new source file and call it *main.rs*. Rust files always end -in a *.rs* extension. If you’re using more than one word in your filename, use -an underscore to separate them; for example, you'd use *hello_world.rs* rather -than *helloworld.rs*. +We need to create a source file for our Rust program. Rust files always end +in a *.rs* extension. If you are using more than one word in your filename, +use an underscore to separate them; for example, you would use +*my_program.rs* rather than *myprogram.rs*. -Now open the *main.rs* file you just created, and type the following code: +Now, make a new file and call it *main.rs*. Open the file and type +the following code: ```rust fn main() { From 0bd7ef0996e8edf11c46f85553af133d38e74881 Mon Sep 17 00:00:00 2001 From: Vanja Cosic Date: Mon, 26 Sep 2016 20:55:59 +0200 Subject: [PATCH 2/2] Remove whitespace from line endings --- src/doc/book/getting-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/doc/book/getting-started.md b/src/doc/book/getting-started.md index 91e25e81026b8..bff448aadd5dc 100644 --- a/src/doc/book/getting-started.md +++ b/src/doc/book/getting-started.md @@ -230,12 +230,12 @@ $ cd hello_world ## Writing and Running a Rust Program -We need to create a source file for our Rust program. Rust files always end -in a *.rs* extension. If you are using more than one word in your filename, -use an underscore to separate them; for example, you would use +We need to create a source file for our Rust program. Rust files always end +in a *.rs* extension. If you are using more than one word in your filename, +use an underscore to separate them; for example, you would use *my_program.rs* rather than *myprogram.rs*. -Now, make a new file and call it *main.rs*. Open the file and type +Now, make a new file and call it *main.rs*. Open the file and type the following code: ```rust