Merge pull request #42 from zdyxry/master

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

diff --git a/src/main.rs b/src/main.rs
index 69d9ca7090a3812d66f88e12e2a42f82d40be17f..66a0ed746a4c183eccc249a9596d02ed42ee0a19 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -39,16 +39,19 @@
 // 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.3.
 // More detailed installation instructions are provided in
 // 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.3.
 // 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).
-// 
-// 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.)
+// 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.)
+//
+// 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
 // --------------


@@ -101,8 +104,8 @@ mod part14;
 mod part15;
 mod part16;
 
 mod part15;
 mod part16;
 

-// To actually run the code of some part (after filling in the blanks, if necessary), simply edit the `main`
-// function.
+// To actually run the code of some part (after filling in the blanks, if necessary), simply edit
+// the `main` function.

 fn main() {
     part00::main();
 }
 fn main() {
     part00::main();
 }


@@ -116,7 +119,9 @@ fn main() {
 // 
 // * [The Rust Book](https://doc.rust-lang.org/stable/book/)
 // * [The Rustonomicon](https://doc.rust-lang.org/nightly/nomicon/)
 // 
 // * [The Rust Book](https://doc.rust-lang.org/stable/book/)
 // * [The Rustonomicon](https://doc.rust-lang.org/nightly/nomicon/)

-// * [Rust by Example](http://rustbyexample.com/)
+// * [Rust by Example](https://doc.rust-lang.org/rust-by-example/)

 // * The [Rust Subreddit](https://www.reddit.com/r/rust/)
 // * The [Rust Subreddit](https://www.reddit.com/r/rust/)

-// * A [collection of links](https://github.com/ctjhoa/rust-learning) to blog posts, articles, videos, etc. for learning Rust.
-// * For the IRC channel and other forums, see the "Community" section of the [Rust Documentation index](https://doc.rust-lang.org/index.html)
+// * A [collection of links](https://github.com/ctjhoa/rust-learning) to blog posts, articles,
+//   videos, etc. for learning Rust.
+// * For the IRC channel and other forums, see the "Community" section of the
+//   [Rust Documentation index](https://doc.rust-lang.org/index.html)