---

yaml
---
r: 23511
b: refs/heads/master
c: 8337fa1
h: refs/heads/master
i:
  23509: b57b8b5
  23507: 5342288
  23503: 764ba55
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d9a6a6365327ac156ef3102e2b7efae1b2be5934
+refs/heads/master: 8337fa1a545e7958389c6025661990eedd9c1b91
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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
 };
 ~~~~
 

trunk/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