From 4b901cdef011f613e9776826836870c5562311a0 Mon Sep 17 00:00:00 2001
From: sg <ronnie.ghose@gmail.com>
Date: Thu, 18 Jul 2013 22:58:21 -0400
Subject: [PATCH 1/3] add bento to build docs

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

diff --git a/doc/source/install.txt b/doc/source/install.txt
index 1186479e..66c8dadc 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -59,4 +59,32 @@ in-place::
 
   python setup.py build_ext -i
 
+In addition you can install using 
+`bento`<http://cournape.github.io/Bento/>_. However Bento requires
+you install it, as well as link to WAFLIB which is part of 
+`Waf`<https://code.google.com/p/waf/>_.
+
+To install bento follow the instructions on the webpage, then link
+to WAF by adding::
+
+export WAFLIB=<the/path/to/your/installation/of/waf>
+
+e.g. WAFLIB=/usr/local/src/waf
+
+then install scikit learn by going to the scikit-image directory
+and typing::
+
+bentomaker install
+
+or if you want to use multiple cores::
+
+bentomaker configure
+bentomaker build  -j <# of cores> -i (if you want to build it inplace)
+bentomaker install
+
+Depending on the permissions of your /usr/local/ dir you might need
+to put a sudo before the ``bentomaker install`` so that
+scikit-image can put ``skivi`` there, which is used for image
+viewing by ``skimage.io.imshow``. 
+ 
 .. include:: ../../DEPENDS.txt

From 8e562af6087bb28ee803e894c5744258f52a37d7 Mon Sep 17 00:00:00 2001
From: sg <ronnie.ghose@gmail.com>
Date: Fri, 19 Jul 2013 21:31:01 -0400
Subject: [PATCH 2/3] added revisions by @stefanv and @ahojnnes

---
 doc/source/install.txt | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/doc/source/install.txt b/doc/source/install.txt
index 66c8dadc..4377aa56 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -60,31 +60,27 @@ in-place::
   python setup.py build_ext -i
 
 In addition you can install using 
-`bento`<http://cournape.github.io/Bento/>_. However Bento requires
-you install it, as well as link to WAFLIB which is part of 
-`Waf`<https://code.google.com/p/waf/>_.
+`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/>_.
 
-To install bento follow the instructions on the webpage, then link
-to WAF by adding::
+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::
 
-export WAFLIB=<the/path/to/your/installation/of/waf>
+    export WAFLIB=<path/to/waf>
 
 e.g. WAFLIB=/usr/local/src/waf
 
-then install scikit learn by going to the scikit-image directory
+to the appropriate config file such as .bashrc or .zshrc.
+then install scikit-image by going to the scikit-image directory
 and typing::
 
-bentomaker install
-
-or if you want to use multiple cores::
-
-bentomaker configure
-bentomaker build  -j <# of cores> -i (if you want to build it inplace)
-bentomaker install
+    bentomaker configure
+    bentomaker build  -j -i (if you want to build it inplace)
+    bentomaker install
 
 Depending on the permissions of your /usr/local/ dir you might need
-to put a sudo before the ``bentomaker install`` so that
-scikit-image can put ``skivi`` there, which is used for image
-viewing by ``skimage.io.imshow``. 
+to run the above command as sudo
  
 .. include:: ../../DEPENDS.txt

From 3296000451df22d7b7f8be901cf0e480bc5029ee Mon Sep 17 00:00:00 2001
From: sg <ronnie.ghose@gmail.com>
Date: Sat, 20 Jul 2013 03:46:10 -0400
Subject: [PATCH 3/3] added ahojnnes revisions

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

diff --git a/doc/source/install.txt b/doc/source/install.txt
index 4377aa56..0fa382f3 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -70,10 +70,8 @@ then make it aware of WAF by adding::
 
     export WAFLIB=<path/to/waf>
 
-e.g. WAFLIB=/usr/local/src/waf
-
-to the appropriate config file such as .bashrc or .zshrc.
-then install scikit-image by going to the scikit-image directory
+to the appropriate config file such as ``.bashrc`` or ``.zshrc``.
+Then install scikit-image by going to the latter's directory
 and typing::
 
     bentomaker configure
@@ -81,6 +79,6 @@ and typing::
     bentomaker install
 
 Depending on the permissions of your /usr/local/ dir you might need
-to run the above command as sudo
+to run the above command as sudo.
  
 .. include:: ../../DEPENDS.txt