From c55ef2e63aa5a54b8cc106fc884d33c5a51828b8 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 22 Jul 2013 11:46:58 +0200
Subject: [PATCH 1/3] Shorten Bento installation instructions and fix broken
 links.

---
 doc/source/install.txt | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/doc/source/install.txt b/doc/source/install.txt
index 0fa382f3..19121d21 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -59,26 +59,27 @@ in-place::
 
   python setup.py build_ext -i
 
-In addition you can install using 
-`bento`<http://cournape.github.io/Bento/>_. However the extension
-requires you to not only install Bento, but also WAFLIB
-which is part of `Waf`<https://code.google.com/p/waf/>_.
+Building with bento
+-------------------
 
-To install bento follow the 
-`instructions on the webpage`<http://cournape.github.io/Bento/html/install.html>,
-then make it aware of WAF by adding::
+``scikit-image`` can also be built using `bento
+<http://cournape.github.io/Bento/>`__.  Bento depends on `WAF
+<https://code.google.com/p/waf/>`__ for compilation.
+
+Follow the `Bento installation instructions
+<http://cournape.github.io/Bento/html/install.html>`__ and `download WAF
+<http://code.google.com/p/waf/downloads/list>`__.
+
+Tell Bento where to find WAF by setting the ``WAFLIB`` environment variable::
 
     export WAFLIB=<path/to/waf>
 
-to the appropriate config file such as ``.bashrc`` or ``.zshrc``.
-Then install scikit-image by going to the latter's directory
-and typing::
+From the ``scikit-image`` source directory::
 
     bentomaker configure
-    bentomaker build  -j -i (if you want to build it inplace)
-    bentomaker install
+    bentomaker build -j     # (add -i for in-place build)
+    bentomaker install      # (when not builing in-place)
 
-Depending on the permissions of your /usr/local/ dir you might need
-to run the above command as sudo.
+Depending on file permissions, the install commands may need to be run as sudo.
  
 .. include:: ../../DEPENDS.txt

From 2a19db609666e3b845c002754ae31664454289c6 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 22 Jul 2013 12:37:39 +0200
Subject: [PATCH 2/3] Environment variable is called WAFDIR.

---
 doc/source/install.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/install.txt b/doc/source/install.txt
index 19121d21..e95f2b20 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -72,7 +72,7 @@ Follow the `Bento installation instructions
 
 Tell Bento where to find WAF by setting the ``WAFLIB`` environment variable::
 
-    export WAFLIB=<path/to/waf>
+    export WAFDIR=<path/to/waf>
 
 From the ``scikit-image`` source directory::
 

From 61ad58125093d3d32ddc157cb9eadbd5a5cb3de2 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 22 Jul 2013 13:02:53 +0200
Subject: [PATCH 3/3] Properly fix WAF environment directory. Tell users to
 download source (not binary).

---
 doc/source/install.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/source/install.txt b/doc/source/install.txt
index e95f2b20..b78c1269 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -67,10 +67,10 @@ Building with bento
 <https://code.google.com/p/waf/>`__ for compilation.
 
 Follow the `Bento installation instructions
-<http://cournape.github.io/Bento/html/install.html>`__ and `download WAF
-<http://code.google.com/p/waf/downloads/list>`__.
+<http://cournape.github.io/Bento/html/install.html>`__ and `download the WAF
+source <http://code.google.com/p/waf/downloads/list>`__.
 
-Tell Bento where to find WAF by setting the ``WAFLIB`` environment variable::
+Tell Bento where to find WAF by setting the ``WAFDIR`` environment variable::
 
     export WAFDIR=<path/to/waf>