Index: /trunk/doc/sphinx/source/tutorial/videostore.rst
===================================================================
--- /trunk/doc/sphinx/source/tutorial/videostore.rst (revision 638)
+++ /trunk/doc/sphinx/source/tutorial/videostore.rst (revision 1180)
@@ -215,8 +215,8 @@
     from camelot.model.i18n import Translation
     return [Section('relation',
-                    Icon('tango/24x24/apps/system-users.png'),
+                    Icon('tango/22x22/apps/system-users.png'),
                     items = [Person, Organization]),
             Section('configuration',
-                    Icon('tango/24x24/categories/preferences-system.png'),
+                    Icon('tango/22x22/categories/preferences-system.png'),
                     items = [Memento, Translation])
             ]
@@ -231,5 +231,5 @@
 
 	Section('movies',
-            Icon('tango/24x24/mimetypes/x-office-presentation.png'),
+            Icon('tango/22x22/mimetypes/x-office-presentation.png'),
             items = [Movie])
 
@@ -249,11 +249,11 @@
     from example.model import Movie
     return [Section('movies', 
-                    Icon('tango/24x24/mimetypes/x-office-presentation.png'),
+                    Icon('tango/22x22/mimetypes/x-office-presentation.png'),
                     items = [Movie]),
             Section('relation',
-                    Icon('tango/24x24/apps/system-users.png'),
+                    Icon('tango/22x22/apps/system-users.png'),
                     items = [Person, Organization]),
             Section('configuration',
-                    Icon('tango/24x24/categories/preferences-system.png'),
+                    Icon('tango/22x22/categories/preferences-system.png'),
                     items = [Memento, Translation])
             ]
@@ -373,5 +373,5 @@
 
 	Section('movies', 
-            Icon('tango/24x24/mimetypes/x-office-presentation.png'),
+            Icon('tango/22x22/mimetypes/x-office-presentation.png'),
             items = [Movie, Director])
 
Index: /trunk/doc/sphinx/source/doc/delegates.rst
===================================================================
--- /trunk/doc/sphinx/source/doc/delegates.rst (revision 1006)
+++ /trunk/doc/sphinx/source/doc/delegates.rst (revision 1180)
@@ -8,5 +8,5 @@
 :Date: |today|
 
-`Delegates` are a cornerstone of the Qt model/view framework.  A delegate is
+`Delegates` are a cornerstone of the Qt model/delegate/view framework.  A delegate is
 used to display and edit data from a `model`.
 
@@ -19,4 +19,8 @@
 
 All Camelot delegates are subclasses of :class:`QAbstractItemDelegate`.
+
+The `PyQT website <http://www.riverbankcomputing.com/static/Docs/PyQt4/html/classes.html>`_
+provides detailed information the differenct classes involved in the 
+model/delegate/view framework.
 
 .. _specifying-delgates:
@@ -41,62 +45,15 @@
 The above code will result in:
 
-.. image:: ../_static/rating.png
+.. image:: ../_static/editors/StarEditor_editable.png
 
 If no `delegate` field attribute is given, a default one will be taken
 depending on the sqlalchemy field type.
 
+All available delegates can be found in :mod:`camelot.view.controls.delegates`
+
 Available delegates
 ===================
 
-All available delegates can be found in :mod:`camelot.view.controls.delegates`
-
-.. automodule:: camelot.view.controls.delegates.booldelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.codedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.colordelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.coloredfloatdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.comboboxdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.currencydelegate
-   :members:   
-.. automodule:: camelot.view.controls.delegates.datedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.datetimedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.filedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.floatdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.imagedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.integerdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.intervalsdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.manytomanydelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.many2onedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.one2manydelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.onetomanychoicesdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.plaintextdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.richtextdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.stardelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.smileydelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.texteditdelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.timedelegate
-   :members:
-.. automodule:: camelot.view.controls.delegates.virtualaddressdelegate
-   :members:
+.. automodule:: camelot.view.controls.delegates
 
 Attributes common to most delegates
Index: /trunk/doc/sphinx/source/doc/models.rst
===================================================================
--- /trunk/doc/sphinx/source/doc/models.rst (revision 838)
+++ /trunk/doc/sphinx/source/doc/models.rst (revision 1180)
@@ -19,6 +19,6 @@
 ======================
 
-.. automodule:: sqlalchemy.types
-   :members:
+SQLAlchemy provides a number of field types that map to available data types in SQL, more information on those
+can be found on the `SQLAlchemy website <http://www.sqlalchemy.org/docs/reference/sqlalchemy/types.html>`_ .
    
 Camelot field types