Rollup merge of rust-lang#37189 - nabeelomer:master, r=bluss

Updated the docs for Error::description Fixes rust-lang#37163
GuillaumeGomez · Oct 17, 2016 · 28416cb · 28416cb
2 parents 1aac569 + 16b8957
commit 28416cb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
@@ -65,9 +65,11 @@ use string;
 pub trait Error: Debug + Display {
     /// A short description of the error.
     ///
-    /// The description should not contain newlines or sentence-ending
-    /// punctuation, to facilitate embedding in larger user-facing
-    /// strings.
+    /// The description should only be used for a simple message.
+    /// It should not contain newlines or sentence-ending punctuation,
+    /// to facilitate embedding in larger user-facing strings.
+    /// For showing formatted error messages with more information see
+    /// [Display](https://doc.rust-lang.org/std/fmt/trait.Display.html).
     ///
     /// # Examples
     ///