---

yaml
---
r: 32173
b: refs/heads/dist-snap
c: 8337fa1
h: refs/heads/master
i:
  32171: 27ee71a
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: d9a6a6365327ac156ef3102e2b7efae1b2be5934
+refs/heads/dist-snap: 8337fa1a545e7958389c6025661990eedd9c1b91
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/doc/rust.md

@@ -842,14 +842,14 @@ An example of imports:
 import foo = core::info;
 import core::float::sin;
 import core::str::{slice, to_upper};
-import core::option::some;
+import core::option::Some;
 
 fn main() {
     // Equivalent to 'log(core::info, core::float::sin(1.0));'
     log(foo, sin(1.0));
 
-    // Equivalent to 'log(core::info, core::option::some(1.0));'
-    log(info, some(1.0));
+    // Equivalent to 'log(core::info, core::option::Some(1.0));'
+    log(info, Some(1.0));
 
     // Equivalent to 'log(core::info,
     //                    core::str::to_upper(core::str::slice(~"foo", 0u, 1u)));'
@@ -2229,14 +2229,14 @@ consist of a bool-typed expression following the `if` keyword. A pattern
 guard may refer to the variables bound within the pattern they follow.
 
 ~~~~
-# let maybe_digit = some(0);
+# let maybe_digit = Some(0);
 # fn process_digit(i: int) { }
 # fn process_other(i: int) { }
 
 let message = match maybe_digit {
-  some(x) if x < 10 => process_digit(x),
-  some(x) => process_other(x),
-  none => fail
+  Some(x) if x < 10 => process_digit(x),
+  Some(x) => process_other(x),
+  None => fail
 };
 ~~~~
 

branches/dist-snap/doc/tutorial.md

@@ -1964,7 +1964,7 @@ Rust's type inferrer works very well with generics, but there are
 programs that just can't be typed.
 
 ~~~~
-let n = option::none;
+let n = option::None;
 # option::iter(n, fn&(&&x:int) {})
 ~~~~
 
@@ -1974,9 +1974,9 @@ you really want to have such a statement, you'll have to write it like
 this:
 
 ~~~~
-let n2: option<int> = option::none;
+let n2: Option<int> = option::None;
 // or
-let n = option::none::<int>;
+let n = option::None::<int>;
 ~~~~
 
 Note that, in a value expression, `<` already has a meaning as a