---

yaml
---
r: 114408
b: refs/heads/master
c: 1ccc51c
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 799ddba8dac2e6b6a7dc6927a7cc0b5e785deecb
+refs/heads/master: 1ccc51ce3b746ee702ef875a90b53b1b06fd2bf8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/librustc/middle/ty.rs

@@ -220,10 +220,10 @@ pub enum AutoRef {
     /// Convert from T to &T
     AutoPtr(Region, ast::Mutability),
 
-    /// Convert from ~[]/&[] to &[] (or str)
+    /// Convert from ~[]/&[] to &[] or str
     AutoBorrowVec(Region, ast::Mutability),
 
-    /// Convert from ~[]/&[] to &&[] (or str)
+    /// Convert from ~[]/&[] to &&[] or str
     AutoBorrowVecRef(Region, ast::Mutability),
 
     /// Convert from T to *T

trunk/src/libstd/lib.rs

@@ -32,7 +32,7 @@
 //!
 //! ## Pervasive types
 //!
-//! The [`option`](option/index.html) and [`result`](result/index.html)
+//! The [`option`](option/index.html) and [`result`](../core/result/index.html)
 //! modules define optional and error-handling types, `Option` and `Result`.
 //! [`iter`](../core/iter/index.html) defines Rust's iterator protocol
 //! along with a wide variety of iterators.

trunk/src/libsyntax/attr.rs

@@ -336,7 +336,7 @@ pub fn test_cfg<AM: AttrMetaMethods, It: Iterator<AM>>
     no_cfgs || some_cfg_matches
 }
 
-/// Represents the #[deprecated="foo"] (etc) attributes.
+/// Represents the #[deprecated="foo"] and friends attributes.
 pub struct Stability {
     pub level: StabilityLevel,
     pub text: Option<InternedString>