work on wording

[rust-101.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 8fbc933865a28e40266f67615fde82ef8b479ec4..835a150d537c7e72507031ea256b1eee3c72f774 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,18 +37,18 @@
 // ---------------
 // 
 // You will need to have Rust installed, of course. It is available for download on
 // ---------------
 // 
 // You will need to have Rust installed, of course. It is available for download on

-// [the Rust website](https://www.rust-lang.org/). Make sure you get at least version 1.2.
+// [the Rust website](https://www.rust-lang.org/). Make sure you get at least version 1.3.

 // More detailed installation instructions are provided in
 // More detailed installation instructions are provided in

-// [the second chapter of The Book](https://doc.rust-lang.org/stable/book/installing-rust.html).
+// [The Book](https://doc.rust-lang.org/stable/book/).

 // This will also install `cargo`, the tool responsible for building rust projects (or *crates*).
 // 
 // This will also install `cargo`, the tool responsible for building rust projects (or *crates*).
 // 

-// Next, fetch the Rust-101 source code from the [git repository](https://www.ralfj.de/git/rust-101.git)
-// (also available [on GitHub](https://github.com/RalfJung/rust-101), and as a
-// [zip archive](https://github.com/RalfJung/rust-101/archive/master.zip) in case you don't have git installed).
+// Next, we have to prepare a workspace for you to conduct your Rust-101 work in, so that you don't
+// have to start with an empty file. The easiest way is to [download the workspace](https://www.ralfj.de/projects/rust-101/workspace.zip)
+// matching the online tutorial. Try `cargo build` in that new folder to check that compiling your workspace succeeds.
+// (You can also execute it with `cargo run`, but you'll need to do some work before this does anything useful.)

 // 
 // 

-// There is a workspace prepared for you in the `workspace` folder. I suggest you copy this
-// folder somewhere else. Try `cargo build` in that new folder to check that compiling your workspace succeeds.
-// (You can also execute it with `cargo run`, but you'll need to do some work before this will succeed.)
+// Alternatively, you can build the workspace from source by fetching the [git repository](https://www.ralfj.de/git/rust-101.git)
+// and running `make workspace`.

 
 // Course Content
 // --------------
 
 // Course Content
 // --------------


@@ -65,7 +65,7 @@
 // 
 // ### Basic Rust
 // 
 // 
 // ### Basic Rust
 // 

-// * [Part 04: Ownership, Borrowing](part04.html)
+// * [Part 04: Ownership, Borrowing, References](part04.html)

 // * [Part 05: Clone](part05.html)
 // * [Part 06: Copy, Lifetimes](part06.html)
 // * [Part 07: Operator Overloading, Tests, Formating](part07.html)
 // * [Part 05: Clone](part05.html)
 // * [Part 06: Copy, Lifetimes](part06.html)
 // * [Part 07: Operator Overloading, Tests, Formating](part07.html)