From dd8151f5e2bd12964f6ed99c8a0d91e7e6c3d3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=86=89=E6=B3=A2?= <wuranbo@gmail.com>
Date: Sat, 2 Jul 2016 15:19:09 +0800
Subject: [PATCH 1/3] doc: make the conditional-compilation example work

If not, the error `does not have these features: foo` confused.
r? @steveklabnik
---
 src/doc/book/conditional-compilation.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/doc/book/conditional-compilation.md b/src/doc/book/conditional-compilation.md
index a6ff75db89b..a175d7cc38b 100644
--- a/src/doc/book/conditional-compilation.md
+++ b/src/doc/book/conditional-compilation.md
@@ -41,8 +41,12 @@ they get set in the [`[features]` section][features] of your `Cargo.toml`:
 # no features by default
 default = []
 
+# Add feature "foo" here, then you can use it. 
+# Our "foo" feature depends on nothings else.
+foo = []
+
 # The “secure-password” feature depends on the bcrypt package.
-secure-password = ["bcrypt"]
+# secure-password = ["bcrypt"]
 ```
 
 When you do this, Cargo passes along a flag to `rustc`:

From 7f3068e52f1943d612923f819dc8d0e996faaaf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=86=89=E6=B3=A2?= <wuranbo@gmail.com>
Date: Wed, 6 Jul 2016 13:52:40 +0800
Subject: [PATCH 2/3] typo nothings -> nothing

---
 src/doc/book/conditional-compilation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doc/book/conditional-compilation.md b/src/doc/book/conditional-compilation.md
index a175d7cc38b..2857d7e64c5 100644
--- a/src/doc/book/conditional-compilation.md
+++ b/src/doc/book/conditional-compilation.md
@@ -42,7 +42,7 @@ they get set in the [`[features]` section][features] of your `Cargo.toml`:
 default = []
 
 # Add feature "foo" here, then you can use it. 
-# Our "foo" feature depends on nothings else.
+# Our "foo" feature depends on nothing else.
 foo = []
 
 # The “secure-password” feature depends on the bcrypt package.

From d30662f3e78ddc65f6ecafd20e4b6ecd3033e466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=86=89=E6=B3=A2?= <wuranbo@gmail.com>
Date: Thu, 7 Jul 2016 10:34:33 +0800
Subject: [PATCH 3/3] doc:remove useless conditional compilation feature

---
 src/doc/book/conditional-compilation.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/doc/book/conditional-compilation.md b/src/doc/book/conditional-compilation.md
index 2857d7e64c5..78ab3c18e45 100644
--- a/src/doc/book/conditional-compilation.md
+++ b/src/doc/book/conditional-compilation.md
@@ -44,9 +44,6 @@ default = []
 # Add feature "foo" here, then you can use it. 
 # Our "foo" feature depends on nothing else.
 foo = []
-
-# The “secure-password” feature depends on the bcrypt package.
-# secure-password = ["bcrypt"]
 ```
 
 When you do this, Cargo passes along a flag to `rustc`: