From 492ee35c92f620ea342f6d24a705805e2c6102a1 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Tue, 3 Nov 2009 08:35:41 +0200
Subject: [PATCH] doc: Add analysis API.

---
 doc/source/api/api.txt                    |  2 ++
 doc/source/api/scikits.image.analysis.txt | 16 ++++++++++
 doc/source/api/scikits.image.io.txt       | 36 +++++++++++++++++++++++
 scikits/image/setup.py                    |  1 -
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 doc/source/api/scikits.image.analysis.txt

diff --git a/doc/source/api/api.txt b/doc/source/api/api.txt
index 921a226d..06e58795 100644
--- a/doc/source/api/api.txt
+++ b/doc/source/api/api.txt
@@ -5,7 +5,9 @@ API Reference
 
 .. toctree::
 
+   scikits.image.analysis
    scikits.image.color
    scikits.image.filter
    scikits.image.io
+   scikits.image.opencv
    scikits.image.transform
diff --git a/doc/source/api/scikits.image.analysis.txt b/doc/source/api/scikits.image.analysis.txt
new file mode 100644
index 00000000..59b6ddd2
--- /dev/null
+++ b/doc/source/api/scikits.image.analysis.txt
@@ -0,0 +1,16 @@
+.. AUTO-GENERATED FILE -- DO NOT EDIT!
+
+Module: :mod:`analysis`
+=======================
+.. automodule:: scikits.image.analysis
+
+.. currentmodule:: scikits.image.analysis
+.. autosummary::
+
+   scikits.image.analysis.shortest_path
+
+shortest_path
+-------------
+
+.. autofunction:: scikits.image.analysis.shortest_path
+
diff --git a/doc/source/api/scikits.image.io.txt b/doc/source/api/scikits.image.io.txt
index e126fd3e..5c8c6e53 100644
--- a/doc/source/api/scikits.image.io.txt
+++ b/doc/source/api/scikits.image.io.txt
@@ -37,14 +37,35 @@ Inheritance diagram for ``scikits.image.io``:
 .. autosummary::
 
    scikits.image.io.imread
+   scikits.image.io.imsave
+   scikits.image.io.imshow
+   scikits.image.io.load_plugin
    scikits.image.io.load_sift
    scikits.image.io.load_surf
+   scikits.image.io.plugins
+   scikits.image.io.show
+   scikits.image.io.use_plugin
 
 imread
 ------
 
 .. autofunction:: scikits.image.io.imread
 
+imsave
+------
+
+.. autofunction:: scikits.image.io.imsave
+
+imshow
+------
+
+.. autofunction:: scikits.image.io.imshow
+
+load_plugin
+-----------
+
+.. autofunction:: scikits.image.io.load_plugin
+
 load_sift
 ---------
 
@@ -55,3 +76,18 @@ load_surf
 
 .. autofunction:: scikits.image.io.load_surf
 
+plugins
+-------
+
+.. autofunction:: scikits.image.io.plugins
+
+show
+----
+
+.. autofunction:: scikits.image.io.show
+
+use_plugin
+----------
+
+.. autofunction:: scikits.image.io.use_plugin
+
diff --git a/scikits/image/setup.py b/scikits/image/setup.py
index 714b30cb..9c96b806 100644
--- a/scikits/image/setup.py
+++ b/scikits/image/setup.py
@@ -10,7 +10,6 @@ def configuration(parent_package='', top_path=None):
     def add_test_directories(arg, dirname, fnames):
         if dirname.split(os.path.sep)[-1] == 'tests':
             config.add_data_dir(dirname)
-            print "Added", dirname
 
     # Add test directories
     from os.path import isdir, dirname, join, abspath