---

yaml
---
r: 97593
b: refs/heads/snap-stage3
c: 6f875c9
h: refs/heads/master
i:
  97591: 7048f70
v: v3

Author: derekchiang

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7fe8692d3347c4eabfad2fbbd8a336069102c63f
+refs/heads/snap-stage3: 6f875c96b3a27e7acb61e421ad667de76e4f0c57
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/guide-container.md

@@ -130,7 +130,7 @@ A typical mutable container will implement at least `iter()`, `mut_iter()` and
 ### Freezing
 
 Unlike most other languages with external iterators, Rust has no *iterator
-invalidation*. As long as an iterator is still in scope, the compiler will prevent
+invalidation*. As long an iterator is still in scope, the compiler will prevent
 modification of the container through another handle.
 
 ~~~

branches/snap-stage3/src/librustdoc/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -109,7 +109,13 @@ pub fn usage(argv0: &str) {
 }
 
 pub fn main_args(args: &[~str]) -> int {
-    let matches = groups::getopts(args.tail(), opts()).unwrap();
+    let matches = match groups::getopts(args.tail(), opts()) {
+        Ok(m) => m,
+        Err(err) => {
+            println(err.to_err_msg());
+            return 1;
+        }
+    };
     if matches.opt_present("h") || matches.opt_present("help") {
         usage(args[0]);
         return 0;