Small documentation changes

I'm leaving the Sized kind undocumented since it isn't fully implemented
yet.

diff --git a/doc/rust.md b/doc/rust.md
index cc53d7d17a25a5019b7f9fe01922bbe38a48e3e5..c61cbe6476ce8af468e7a38030111f1b2bd74233 100644 (file)
--- a/doc/rust.md
+++ b/doc/rust.md
@@ -2869,9 +2869,6 @@ The kinds are:
   : Types of this kind can be safely sent between tasks.
     This kind includes scalars, owning pointers, owned closures, and
     structural types containing only other owned types. All `Send` types are `Static`.
-`Static`
-  : Types of this kind do not contain any borrowed pointers;
-    this can be a useful guarantee for code that breaks borrowing assumptions using [`unsafe` operations](#unsafe-functions).
 `Copy`
   : This kind includes all types that can be copied. All types with
     sendable kind are copyable, as are managed boxes, managed closures,

diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs
index e6be164099bf00b2e6315fee864d0463c8255872..b0b586df4b58edcd6daa4d40d53301a00ea64b77 100644 (file)
--- a/src/libstd/bool.rs
+++ b/src/libstd/bool.rs
@@ -122,6 +122,7 @@ pub fn xor(a: bool, b: bool) -> bool { (a && !b) || (!a && b) }
 * ~~~ {.rust}
 * rusti> std::bool::implies(true, true)
 * true
+* ~~~
 *
 * ~~~ {.rust}
 * rusti> std::bool::implies(true, false)

diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs
index f350e1061680524e9ea7cbb0a24bbafef0b070d6..6c16ecc0d4ef8bc5ef84b1774d2727e0c560bafd 100644 (file)
--- a/src/libstd/kinds.rs
+++ b/src/libstd/kinds.rs
@@ -18,7 +18,7 @@
 They cannot be implemented by user code, but are instead implemented
 by the compiler automatically for the types to which they apply.
 
-The 4 kinds are
+The 3 kinds are
 
 * Copy - types that may be copied without allocation. This includes
   scalar types and managed pointers, and exludes owned pointers. It