auto merge of #11245 : alexcrichton/rust/issue-11225, r=pcwalton

Commit messages are a little more descriptive.

2 files changed, 3 insertions, 0 deletions

diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 2d52986294d..13d67ff354a 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -53,6 +53,8 @@ Some examples of obvious things you might want to do
     # let _g = ::std::io::ignore_io_error();
     let mut file = File::create(&Path::new("message.txt"));
     file.write(bytes!("hello, file!\n"));
+    # drop(file);
+    # ::std::io::fs::unlink(&Path::new("message.txt"));
     ```
 
 * Iterate over the lines of a file
diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs
index d7e11d2f3a7..95fdce99ea6 100644
--- a/src/libstd/local_data.rs
+++ b/src/libstd/local_data.rs
@@ -62,6 +62,7 @@ pub type Key<T> = &'static KeyValue<T>;
 #[allow(missing_doc)]
 pub enum KeyValue<T> { Key }
 
+#[allow(missing_doc)]
 trait LocalData {}
 impl<T: 'static> LocalData for T {}