From 11c7987ff139c002772588cbd17d9282c3a4efb3 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sun, 8 Nov 2009 01:35:15 +0200
Subject: [PATCH] doc: Update dependencies.

---
 REQUIREMENTS.txt => DEPENDS.txt  | 21 +++++++++++----------
 README.txt                       |  3 ++-
 doc/source/_templates/index.html | 11 +++++++++--
 doc/source/install.txt           |  2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)
 rename REQUIREMENTS.txt => DEPENDS.txt (50%)

diff --git a/REQUIREMENTS.txt b/DEPENDS.txt
similarity index 50%
rename from REQUIREMENTS.txt
rename to DEPENDS.txt
index ede74b84..337ee9e9 100644
--- a/REQUIREMENTS.txt
+++ b/DEPENDS.txt
@@ -1,24 +1,25 @@
 Build Requirements
 ------------------
-
-* Python 2.6
+* Python 2.5
 * `Numpy <http://numpy.scipy.org/>`_
-* `Scipy <http://www.scipy.org/>`_
 * `Cython <http://www.cython.org/>`_
 
+Usage Requirements
+------------------
+* `Scipy <http://www.scipy.org/>`_
+* `Python Imaging Library (PIL) <http://www.pythonware.com/products/pil/>`_
+  
 Optional Requirements
 ---------------------
-
-You can use this Scikit with the basic requirements listed above, but additional libraries are required for image I/O and some image processing/analysis capabilities.
+You can use this scikit with the basic requirements listed above, but some
+functionality is only available with the following installed:
 
 `Open CV <http://opencv.willowgarage.com/wiki/>`_ (>= 2.0). 
    Required for functions in ``scikits.image.opencv``.
 
-`Python Imaging Library (PIL) <http://www.pythonware.com/products/pil/>`_
-   Used for ``scikits.io.imread`` and ``scikits.io.imsave``.
-
 `PyQt4 <http://wiki.python.org/moin/PyQt>`_
-   Used for ``scikits.io.imshow``.
+   The `qt` plugin that provides `imshow` and `scivy`.
 
 `PyGTK <http://www.pygtk.org/>`_
-   Used for ``scikits.io.imshow``.
+   The `gtk` plugin that provides `imshow`.
+
diff --git a/README.txt b/README.txt
index 1bf5725a..bcdaec07 100644
--- a/README.txt
+++ b/README.txt
@@ -11,8 +11,9 @@ http://groups.google.com/group/scikits-image
 
 Installation from source
 ------------------------
+Refer to DEPENDS.txt for a list of dependencies.
 
-This SciKit can be installed globally using
+The SciKit may be installed globally using
 
 python setup.py install
 
diff --git a/doc/source/_templates/index.html b/doc/source/_templates/index.html
index 5e3087ac..c0d26cae 100644
--- a/doc/source/_templates/index.html
+++ b/doc/source/_templates/index.html
@@ -32,14 +32,21 @@
 
    </td><td width="50%">
 
-      <p class="biglink">
+    <p class="biglink">
          <a class="biglink" href="{{ pathto('api/api') }}">
             API Reference</a><br/>
          <span class="linkdescr">
              Documentation for the functions included in {{project}}.
          </span></p>
 
-      <p class="biglink">
+     <p class="biglink">
+         <a class="biglink" href="{{ pathto('user_guide') }}">
+            User Guide</a><br/>
+         <span class="linkdescr">
+             Usage guidelines.
+         </span></p>
+
+     <p class="biglink">
          <a class="biglink" href="{{ pathto('license') }}">
             License Info</a><br/>
          <span class="linkdescr">
diff --git a/doc/source/install.txt b/doc/source/install.txt
index cf2ea19a..df77bb2e 100644
--- a/doc/source/install.txt
+++ b/doc/source/install.txt
@@ -23,4 +23,4 @@ in-place::
 
   python setup.py build_ext -i
 
-.. include:: ../../REQUIREMENTS.txt
+.. include:: ../../DEPENDS.txt