diff --git a/doc/source/api/scikits.image.color.txt b/doc/source/api/scikits.image.color.txt
index eb7a91c4..ee2bbe8f 100644
--- a/doc/source/api/scikits.image.color.txt
+++ b/doc/source/api/scikits.image.color.txt
@@ -7,10 +7,46 @@ Module: :mod:`color`
 .. currentmodule:: scikits.image.color
 .. autosummary::
 
+   scikits.image.color.convert_colorspace
+   scikits.image.color.hsv2rgb
    scikits.image.color.rgb2hsv
+   scikits.image.color.rgb2rgbcie
+   scikits.image.color.rgb2xyz
+   scikits.image.color.rgbcie2rgb
+   scikits.image.color.xyz2rgb
+
+convert_colorspace
+------------------
+
+.. autofunction:: scikits.image.color.convert_colorspace
+
+hsv2rgb
+-------
+
+.. autofunction:: scikits.image.color.hsv2rgb
 
 rgb2hsv
 -------
 
 .. autofunction:: scikits.image.color.rgb2hsv
 
+rgb2rgbcie
+----------
+
+.. autofunction:: scikits.image.color.rgb2rgbcie
+
+rgb2xyz
+-------
+
+.. autofunction:: scikits.image.color.rgb2xyz
+
+rgbcie2rgb
+----------
+
+.. autofunction:: scikits.image.color.rgbcie2rgb
+
+xyz2rgb
+-------
+
+.. autofunction:: scikits.image.color.xyz2rgb
+
diff --git a/doc/source/api/scikits.image.opencv.txt b/doc/source/api/scikits.image.opencv.txt
index 547d5921..42882564 100644
--- a/doc/source/api/scikits.image.opencv.txt
+++ b/doc/source/api/scikits.image.opencv.txt
@@ -2,29 +2,68 @@
 
 Module: :mod:`opencv`
 =====================
+Inheritance diagram for ``scikits.image.opencv``:
+
+.. inheritance-diagram:: scikits.image.opencv 
+   :parts: 3
+
 .. automodule:: scikits.image.opencv
 
 .. currentmodule:: scikits.image.opencv
+
+:class:`cvdoc`
+--------------
+
+
+.. autoclass:: cvdoc
+  :members:
+  :undoc-members:
+  :show-inheritance:
+  :inherited-members:
+
+  .. automethod:: __init__
 .. autosummary::
 
+   scikits.image.opencv.cvAdaptiveThreshold
+   scikits.image.opencv.cvCalibrateCamera2
    scikits.image.opencv.cvCanny
    scikits.image.opencv.cvCornerEigenValsAndVecs
    scikits.image.opencv.cvCornerHarris
    scikits.image.opencv.cvCornerMinEigenVal
+   scikits.image.opencv.cvCvtColor
+   scikits.image.opencv.cvDilate
    scikits.image.opencv.cvDrawChessboardCorners
+   scikits.image.opencv.cvErode
+   scikits.image.opencv.cvFilter2D
    scikits.image.opencv.cvFindChessboardCorners
    scikits.image.opencv.cvFindCornerSubPix
    scikits.image.opencv.cvGetQuadrangleSubPix
    scikits.image.opencv.cvGetRectSubPix
    scikits.image.opencv.cvGoodFeaturesToTrack
+   scikits.image.opencv.cvIntegral
    scikits.image.opencv.cvLaplace
+   scikits.image.opencv.cvLogPolar
+   scikits.image.opencv.cvMorphologyEx
    scikits.image.opencv.cvPreCornerDetect
+   scikits.image.opencv.cvPyrDown
+   scikits.image.opencv.cvPyrUp
    scikits.image.opencv.cvResize
    scikits.image.opencv.cvSmooth
    scikits.image.opencv.cvSobel
+   scikits.image.opencv.cvThreshold
    scikits.image.opencv.cvWarpAffine
    scikits.image.opencv.cvWarpPerspective
 
+cvAdaptiveThreshold
+-------------------
+
+.. autofunction:: scikits.image.opencv.cvAdaptiveThreshold
+
+cvCalibrateCamera2
+------------------
+
+.. autofunction:: scikits.image.opencv.cvCalibrateCamera2
+
 cvCanny
 -------
 
@@ -45,11 +84,31 @@ cvCornerMinEigenVal
 
 .. autofunction:: scikits.image.opencv.cvCornerMinEigenVal
 
+cvCvtColor
+----------
+
+.. autofunction:: scikits.image.opencv.cvCvtColor
+
+cvDilate
+--------
+
+.. autofunction:: scikits.image.opencv.cvDilate
+
 cvDrawChessboardCorners
 -----------------------
 
 .. autofunction:: scikits.image.opencv.cvDrawChessboardCorners
 
+cvErode
+-------
+
+.. autofunction:: scikits.image.opencv.cvErode
+
+cvFilter2D
+----------
+
+.. autofunction:: scikits.image.opencv.cvFilter2D
+
 cvFindChessboardCorners
 -----------------------
 
@@ -75,16 +134,41 @@ cvGoodFeaturesToTrack
 
 .. autofunction:: scikits.image.opencv.cvGoodFeaturesToTrack
 
+cvIntegral
+----------
+
+.. autofunction:: scikits.image.opencv.cvIntegral
+
 cvLaplace
 ---------
 
 .. autofunction:: scikits.image.opencv.cvLaplace
 
+cvLogPolar
+----------
+
+.. autofunction:: scikits.image.opencv.cvLogPolar
+
+cvMorphologyEx
+--------------
+
+.. autofunction:: scikits.image.opencv.cvMorphologyEx
+
 cvPreCornerDetect
 -----------------
 
 .. autofunction:: scikits.image.opencv.cvPreCornerDetect
 
+cvPyrDown
+---------
+
+.. autofunction:: scikits.image.opencv.cvPyrDown
+
+cvPyrUp
+-------
+
+.. autofunction:: scikits.image.opencv.cvPyrUp
+
 cvResize
 --------
 
@@ -100,6 +184,11 @@ cvSobel
 
 .. autofunction:: scikits.image.opencv.cvSobel
 
+cvThreshold
+-----------
+
+.. autofunction:: scikits.image.opencv.cvThreshold
+
 cvWarpAffine
 ------------