about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-10-06 22:57:40 -0700
committerBrian Anderson <banderson@mozilla.com>2012-10-06 22:57:40 -0700
commitf0c4140dd09555e274e472a0d14fd22bbef579d8 (patch)
tree71f78930c981c928162bf4d8686142188e293c95
parentc6330036a4e20a60f7ade12ed9f4d53b8fc9d762 (diff)
More tutorial tweaking
-rw-r--r--doc/tutorial.md23
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/tutorial.md b/doc/tutorial.md
index 33b66d0a1cd..c06c9b54772 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -128,19 +128,7 @@ fn main() {
 
 If the Rust compiler was installed successfully, running `rustc
 hello.rs` will produce an executable called `hello` (or `hello.exe` on
-Windows) which, upon running, will likely do exactly what you expect
-(unless you are on Windows, in which case what it does is subject
-to local weather conditions).
-
-> ***Note:*** That may or may not be hyperbole, but there are some
-> 'gotchas' to be aware of on Windows. First, the MinGW environment
-> must be set up perfectly. Please read [the
-> wiki][wiki-started]. Second, `rustc` may need to be [referred to as
-> `rustc.exe`][bug-3319]. It's a bummer, I know, and I am so very
-> sorry.
-
-[bug-3319]: https://github.com/mozilla/rust/issues/3319
-[wiki-started]:	https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
+Windows) which, upon running, will likely do exactly what you expect.
 
 The Rust compiler tries to provide useful information when it runs
 into an error. If you modify the program to make it invalid (for
@@ -160,6 +148,15 @@ declaration to appear at the top level of the file—all statements must
 live inside a function.  Rust programs can also be compiled as
 libraries, and included in other programs.
 
+> ***Note:*** There are some 'gotchas' to be aware of on
+> Windows. First, the MinGW environment must be set up
+> perfectly. Please read [the wiki][wiki-started]. Second, `rustc` may
+> need to be [referred to as `rustc.exe`][bug-3319]. It's a bummer, I
+> know.
+
+[bug-3319]: https://github.com/mozilla/rust/issues/3319
+[wiki-started]:	https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
+
 ## Editing Rust code
 
 There are vim highlighting and indentation scripts in the Rust source