auto merge of #5609 : Kimundi/rust/incoming, r=catamorphism

Author: bors

Diff for: src/libcore/str.rs

@@ -726,7 +726,8 @@ pub fn each_split_within<'a>(ss: &'a str,
 
             (B, Cr, UnderLim) => { B }
             (B, Cr, OverLim)  if (i - last_start + 1) > lim
-                              => { fail!(~"word longer than limit!") }
+                              => fail!(fmt!("word starting with %? longer than limit!",
+                                            self::slice(ss, last_start, i + 1))),
             (B, Cr, OverLim)  => { slice(); slice_start = last_start; B }
             (B, Ws, UnderLim) => { last_end = i; C }
             (B, Ws, OverLim)  => { last_end = i; slice(); A }

Diff for: src/librustc/driver/driver.rs

@@ -762,8 +762,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
   optflag(~"", ~"test", ~"Build a test harness"),
   optopt(~"", ~"target",
                         ~"Target triple cpu-manufacturer-kernel[-os]
-                          to compile for (see
-         http://sources.redhat.com/autobook/autobook/autobook_17.html
+                          to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/
                           for detail)", ~"TRIPLE"),
   optopt(~"", ~"android-cross-path",
          ~"The path to the Android NDK", "PATH"),