rollup merge of #23893: frewsxcv/patch-6

This commit is contained in:
Alex Crichton 2015-03-31 10:15:35 -07:00
commit acdb0f9c78

View File

@ -114,7 +114,7 @@
//! ```
//!
//! Reading from a channel with a timeout requires to use a Timer together
//! with the channel. You can use the select! macro to select either and
//! with the channel. You can use the `select!` macro to select either and
//! handle the timeout case. This first example will break out of the loop
//! after 10 seconds no matter what:
//!