auto merge of #9844 : bytbox/rust/master, r=alexcrichton

bors · bors · commit 5b10781c7b95 · 2013-10-13T23:41:30.000-07:00
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs
@@ -19,9 +19,8 @@
 * C bindings as appropriate for the target platform. The exact
 * set of functions available are platform specific.
 *
-* *Note* Rustdoc does not indicate reexports currently. Also, because these
-* definitions are platform-specific, some may not
-* appear in the generated documentation.
+* *Note* Because these definitions are platform-specific, some may not appear in
+* the generated documentation.
 *
 * We consider the following specs reasonably normative with respect
 * to interoperating with the C standard library (libc/msvcrt):

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,8 @@`
`19`	`19`	`* C bindings as appropriate for the target platform. The exact`
`20`	`20`	`* set of functions available are platform specific.`
`21`	`21`	`*`
`22`		`-* Note Rustdoc does not indicate reexports currently. Also, because these`
`23`		`-* definitions are platform-specific, some may not`
`24`		`-* appear in the generated documentation.`
	`22`	`+* Note Because these definitions are platform-specific, some may not appear in`
	`23`	`+* the generated documentation.`
`25`	`24`	`*`
`26`	`25`	`* We consider the following specs reasonably normative with respect`
`27`	`26`	`* to interoperating with the C standard library (libc/msvcrt):`