---

yaml
---
r: 127671
b: refs/heads/snap-stage3
c: 9151599
h: refs/heads/master
i:
  127669: a389789
  127667: 4b3e826
  127663: 6a2702e
v: v3

Author: parir

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 49a970f2449a78f28b6c301e542d38593094ca77
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e7a5e8ff3bafa6d4d5a517e399597666947a5e07
+refs/heads/snap-stage3: 9151599ec87e86b429e049b251a5470a29ea5948
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/doc/guide.md

@@ -27,7 +27,7 @@ Sound good? Let's go!
 # Installing Rust
 
 The first step to using Rust is to install it! There are a number of ways to
-install Rust, but the easiest is to use the the `rustup` script. If you're on
+install Rust, but the easiest is to use the `rustup` script. If you're on
 Linux or a Mac, all you need to do is this (note that you don't need to type
 in the `$`s, they just indicate the start of each command):
 
@@ -120,7 +120,7 @@ to make a projects directory in my home directory, and keep all my projects
 there. Rust does not care where your code lives.
 
 This actually leads to one other concern we should address: this tutorial will
-assume that you have basic familiarity with the command-line. Rust does not
+assume that you have basic familiarity with the command line. Rust does not
 require that you know a whole ton about the command line, but until the
 language is in a more finished state, IDE support is spotty. Rust makes no
 specific demands on your editing tooling, or where your code lives.
@@ -452,7 +452,7 @@ what you need, so it's not verboten.
 
 Let's get back to bindings. Rust variable bindings have one more aspect that
 differs from other languages: bindings are required to be initialized with a
-value before you're allowed to use it. If we try...
+value before you're allowed to use them. If we try...
 
 ```{ignore}
 let x;
@@ -2281,7 +2281,7 @@ change that by adding loops!
 
 ## Looping
 
-As we already discussed, the `loop` key word gives us an infinite loop. So
+As we already discussed, the `loop` keyword gives us an infinite loop. So
 let's add that in:
 
 ```{rust,no_run}
@@ -4099,7 +4099,7 @@ fn inverse(x: f64) -> Result<f64, String> {
 ```
 
 We don't want to take the inverse of zero, so we check to make sure that we
-weren't passed one. If we weren't, then we return an `Err`, with a message. If
+weren't passed zero. If we were, then we return an `Err`, with a message. If
 it's okay, we return an `Ok`, with the answer.
 
 Why does this matter? Well, remember how `match` does exhaustive matches?

branches/snap-stage3/src/doc/tutorial.md

@@ -1133,16 +1133,6 @@ let xs = Cons(1, box Cons(2, box Cons(3, box Nil)));
 let ys = xs; // copies `Cons(u32, pointer)` shallowly
 ~~~
 
-> *Note:* Names like `xs` and `ys` are a naming
-> convention for collection-like data structures
-> (like our `List`). These collections are given 
-> names appended with 's' to signify plurality, 
-> i.e. that the data structure stores multiple 
-> elements.  For example, `xs` in this case can 
-> be read as "a list of ex-es", where "x" here 
-> are elements of type `u32`.
-
-
 Rust will consider a shallow copy of a type with a destructor like `List` to
 *move ownership* of the value. After a value has been moved, the source
 location cannot be used unless it is reinitialized.