---

yaml
---
r: 35454
b: refs/heads/master
c: 04d9ea6
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1b481017acfc51063d6ab69de6e310634ceb6804
+refs/heads/master: 04d9ea6f32393c2e72e6b75b3c52c473dc49bce8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/libcore/pipes.rs

@@ -416,7 +416,7 @@ pub fn recv<T: Send, Tbuffer: Send>(p: RecvPacketBuffered<T, Tbuffer>) -> T {
 
 /** Attempts to receive a message from a pipe.
 
-Returns `none` if the sender has closed the connection without sending
+Returns `None` if the sender has closed the connection without sending
 a message, or `Some(T)` if a message was received.
 
 */
@@ -1149,7 +1149,7 @@ pub fn SharedChan<T:Send>(c: Chan<T>) -> SharedChan<T> {
 
 /// Receive a message from one of two endpoints.
 pub trait Select2<T: Send, U: Send> {
-    /// Receive a message or return `none` if a connection closes.
+    /// Receive a message or return `None` if a connection closes.
     fn try_select() -> Either<Option<T>, Option<U>>;
     /// Receive a message or fail if a connection closes.
     fn select() -> Either<T, U>;