Rollup merge of #27651 - tshepang:patch-8, r=Gankro

Manishearth · Manishearth · commit aebd6d510624 · 2015-08-11T16:48:03.000+05:30
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
@@ -748,7 +748,7 @@ impl AsInner<fs_imp::DirEntry> for DirEntry {
     fn as_inner(&self) -> &fs_imp::DirEntry { &self.0 }
 }
 
-/// Removes a file from the underlying filesystem.
+/// Removes a file from the filesystem.
 ///
 /// Note that there is no
 /// guarantee that the file is immediately deleted (e.g. depending on

Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@ impl AsInner<fs_imp::DirEntry> for DirEntry {`
`748`	`748`	`fn as_inner(&self) -> &fs_imp::DirEntry { &self.0 }`
`749`	`749`	`}`
`750`	`750`
`751`		`-/// Removes a file from the underlying filesystem.`
	`751`	`+/// Removes a file from the filesystem.`
`752`	`752`	`///`
`753`	`753`	`/// Note that there is no`
`754`	`754`	`/// guarantee that the file is immediately deleted (e.g. depending on`