Rollup merge of rust-lang#22111 - robinst:option-docs-flatmap, r=steveklabnik

Some newcomers might look for a "flatMap" method on Option. Include the
reference so that searching the page would find "and_then".

Author: Manishearth

src/libcore/option.rs

@@ -605,6 +605,8 @@ impl<T> Option<T> {
     /// Returns `None` if the option is `None`, otherwise calls `f` with the
     /// wrapped value and returns the result.
     ///
+    /// Some languages call this operation flatmap.
+    ///
     /// # Example
     ///
     /// ```