---

yaml
---
r: 128975
b: refs/heads/try
c: 6d18922
h: refs/heads/master
i:
  128973: 93e03f8
  128971: 8b7ec6c
  128967: eb21c4c
  128959: 8712dfb
v: v3

Author: EduardoBautista

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
-refs/heads/try: 7ebb392fa9d8ead6b4680cbcc4eca5ad79732901
+refs/heads/try: 6d189220d19f32e1c0ebc4395cad58a2708fc574
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/doc/guide.md

@@ -2148,7 +2148,7 @@ a function for that:
 let input = io::stdin().read_line()
                        .ok()
                        .expect("Failed to read line");
-let guess: Option<uint> = from_str(input.as_slice());
+let input_num: Option<uint> = from_str(input.as_slice());
 ```
 
 The `from_str` function takes in a `&str` value and converts it into something.
@@ -2170,8 +2170,8 @@ In this case, we say `x` is a `uint` explicitly, so Rust is able to properly
 tell `random()` what to generate. In a similar fashion, both of these work:
 
 ```{rust,ignore}
-let guess = from_str::<Option<uint>>("5");
-let guess: Option<uint> = from_str("5");
+let input_num = from_str::<Option<uint>>("5");
+let input_num: Option<uint> = from_str("5");
 ```
 
 In this case, I happen to prefer the latter, and in the `random()` case, I prefer