Merge remote-tracking branch 'remotes/origin/master' into error-take-2

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"
@@ -9,9 +9,9 @@ documentation = "https://serde-rs.github.io/serde/serde/serde/index.html"
 readme = "../README.md"
 keywords = ["serde", "serialization"]
 
-[dependencies]
-num = "*"
+[dependencies.num]
+version = "^0.1.27"
+default-features = false
 
 [features]
 nightly = []
-

serde/src/lib.rs

@@ -5,6 +5,9 @@
 //! handshake protocol between serializers and serializees can be completely optimized away,
 //! leaving serde to perform roughly the same speed as a hand written serializer for a specific
 //! type.
+//! 
+//! For a detailed tutorial on the different ways to use serde please check out the
+//! [github repository](https://github.com/serde-rs/serde)
 
 #![doc(html_root_url="https://serde-rs.github.io/serde/serde")]
 #![cfg_attr(feature = "nightly", feature(collections, core, enumset, nonzero, step_trait, zero_one))]

serde/src/ser/mod.rs

@@ -337,7 +337,7 @@ pub trait SeqVisitor {
     }
 }
 
-/// A trait that is used by a `Serializer` to iterate through a map.
+/// A trait that is used by a `Serialize` to iterate through a map.
 pub trait MapVisitor {
     /// Serializes a map item in the serializer.
     ///