Rollup merge of rust-lang#24772 - steveklabnik:gh24712, r=alexcrichton

FIxes rust-lang#24712

Author: steveklabnik

src/libcore/convert.rs

@@ -11,7 +11,7 @@
 //! Traits for conversions between types.
 //!
 //! The traits in this module provide a general way to talk about conversions from one type to
-//! another. They follow the standard Rust conventions of `as`/`to`/`into`/`from`.
+//! another. They follow the standard Rust conventions of `as`/`into`/`from`.
 //!
 //! Like many traits, these are often used as bounds for generic functions, to support arguments of
 //! multiple types.