about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-15 01:53:03 +0000
committerbors <bors@rust-lang.org>2015-05-15 01:53:03 +0000
commitdaabc8a0c70693aaec3a424768ee216f59997acb (patch)
tree7fb4fcb75011f0c40d49f87eb65da2d4470574a5 /src/libstd
parent2792855fe60eb086b02522ead11affdf646379e3 (diff)
parent6df13d4d886361776ebd8173c60adb4161d315b7 (diff)
downloadrust-daabc8a0c70693aaec3a424768ee216f59997acb.tar.gz
rust-daabc8a0c70693aaec3a424768ee216f59997acb.zip
Auto merge of #25421 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #25404, #25405, #25407, #25408, #25410, #25412, #25413, #25414, #25418, #25420
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 220a0ba5755..2e48cde18f3 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -40,7 +40,7 @@
 //! [`result`](result/index.html) modules define optional and
 //! error-handling types, `Option` and `Result`. The
 //! [`iter`](iter/index.html) module defines Rust's iterator trait,
-//! [`Iterater`](iter/trait.Iterator.html), which works with the `for`
+//! [`Iterator`](iter/trait.Iterator.html), which works with the `for`
 //! loop to access collections.
 //!
 //! The common container type, `Vec`, a growable vector backed by an array,