From eb69fee5ffb2bf3b3103eb3a02578f5a020b0358 Mon Sep 17 00:00:00 2001
From: Garrett Berg <vitiral@gmail.com>
Date: Sun, 30 Jul 2017 10:18:00 -0600
Subject: [PATCH 1/2] doc fixes

---
 src/ser.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ser.rs b/src/ser.rs
index 721fbf1..b055f28 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -265,15 +265,15 @@ impl<'a> Serializer<'a> {
     ///
     /// Instead of:
     ///
-    /// ```ignore
+    /// ```toml,ignore
     /// single = "no newlines"
     /// text = "\nfoo\nbar\n"
     /// ```
     ///
     /// You will have:
     ///
-    /// ```ignore
-    /// single = "no newlines"
+    /// ```toml,ignore
+    /// single = 'no newlines'
     /// text = '''
     /// foo
     /// bar
@@ -299,13 +299,13 @@ impl<'a> Serializer<'a> {
     ///
     /// Instead of:
     ///
-    /// ```ignore
+    /// ```toml,ignore
     /// array = ["foo", "bar"]
     /// ```
     ///
     /// You will have:
     ///
-    /// ```ignore
+    /// ```toml,ignore
     /// array = [
     ///     "foo",
     ///     "bar",

From 0552812f1a7c21c88b31d3963582c152c7863e8a Mon Sep 17 00:00:00 2001
From: Garrett Berg <vitiral@gmail.com>
Date: Sun, 30 Jul 2017 17:38:02 -0600
Subject: [PATCH 2/2] don't run `cargo doc` for 1.15.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c9e484b..e4c5407 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_script:
 script:
   - cargo test
   - rustdoc --test README.md -L target
-  - cargo doc --no-deps
+  - test "$TRAVIS_RUST_VERSION" != "1.15.0" && cargo doc --no-deps || echo "skipping cargo doc"
 after_success:
   - travis-cargo --only nightly doc-upload
   - travis-cargo coveralls --no-sudo