---

yaml
---
r: 22375
b: refs/heads/snap-stage3
c: f0c4140
h: refs/heads/master
i:
  22373: e75fa65
  22371: 3c338ee
  22367: d42d03a
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c6330036a4e20a60f7ade12ed9f4d53b8fc9d762
+refs/heads/snap-stage3: f0c4140dd09555e274e472a0d14fd22bbef579d8
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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