---

yaml
---
r: 33145
b: refs/heads/dist-snap
c: f0c4140
h: refs/heads/master
i:
  33143: 7015015
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: c6330036a4e20a60f7ade12ed9f4d53b8fc9d762
+refs/heads/dist-snap: f0c4140dd09555e274e472a0d14fd22bbef579d8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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