Index: main/waeup.kofa/trunk/docs/source/developerdocs/api/api_applicants.rst
===================================================================
--- main/waeup.kofa/trunk/docs/source/developerdocs/api/api_applicants.rst	(revision 7808)
+++ main/waeup.kofa/trunk/docs/source/developerdocs/api/api_applicants.rst	(revision 7818)
@@ -26,5 +26,4 @@
    applicants/api_browser
    applicants/api_permissions
-   applicants/api_vocabularies
    applicants/api_workflow
 
Index: main/waeup.kofa/trunk/docs/source/developerdocs/api/api_payments.rst
===================================================================
--- main/waeup.kofa/trunk/docs/source/developerdocs/api/api_payments.rst	(revision 7808)
+++ main/waeup.kofa/trunk/docs/source/developerdocs/api/api_payments.rst	(revision 7818)
@@ -20,4 +20,3 @@
    payments/api_payment
    payments/api_container
-   payments/api_vocabularies
    payments/api_interfaces
Index: main/waeup.kofa/trunk/docs/source/developerdocs/api/applicants/api_vocabularies.rst
===================================================================
--- main/waeup.kofa/trunk/docs/source/developerdocs/api/applicants/api_vocabularies.rst	(revision 7808)
+++ 	(revision )
@@ -1,6 +1,0 @@
-`applicants.vocabularies` - Vocabularies and Sources
-****************************************************
-
-.. automodule:: waeup.kofa.applicants.vocabularies
-   :members:
-   :undoc-members:
Index: main/waeup.kofa/trunk/docs/source/developerdocs/api/payments/api_vocabularies.rst
===================================================================
--- main/waeup.kofa/trunk/docs/source/developerdocs/api/payments/api_vocabularies.rst	(revision 7808)
+++ 	(revision )
@@ -1,6 +1,0 @@
-`payments.vocabularies` - Payment Vocabularies
-**********************************************
-
-.. automodule:: waeup.kofa.payments.vocabularies
-   :members:
-   :undoc-members:
Index: main/waeup.kofa/trunk/docs/source/developerdocs/developernotes.rst
===================================================================
--- main/waeup.kofa/trunk/docs/source/developerdocs/developernotes.rst	(revision 7808)
+++ main/waeup.kofa/trunk/docs/source/developerdocs/developernotes.rst	(revision 7818)
@@ -2,8 +2,8 @@
 ***************
 
-How to setup a developer instance of the WAeUP.KOFA, handle tests, docs
+How to setup a developer instance of the WAeUP.Kofa, handle tests, docs
 etc.
 
-The new WAeUP.KOFA is based on `Grok <http://grok.zope.org/>`_.
+The new WAeUP.Kofa is based on `Grok <http://grok.zope.org/>`_.
 
 Installing a developer copy
@@ -15,5 +15,5 @@
 --------------------
 
-To create a working copy of the WAeUP.KOFA we recommend use of
+To create a working copy of the WAeUP.Kofa we recommend use of
 `virtualenv`. You, however, need also some basic libraries, a C
 compiler and some things more.
@@ -127,5 +127,5 @@
 In the sandbox (or anywhere else) we now create our real working
 environment. To do this, we change to the sandbox and checkout the
-sources of the WAeUP.KOFA from the subversion server::
+sources of the WAeUP.Kofa from the subversion server::
 
   $ cd mysandbox/
@@ -277,5 +277,5 @@
 
   Most unit tests furthermore declare that they want to be run inside
-  the `WAeUPKOFAUnitTestLayer` defined in `waeup.kofa.testing`. This
+  the `WAeUPKofaUnitTestLayer` defined in `waeup.kofa.testing`. This
   layer groks the whole `waeup.kofa` package, so that all ZCA
   components are already setup when you start your tests.
@@ -284,5 +284,5 @@
   layer, the testfile has to provide the following line::
 
-    .. :layer: waeup.kofa.testing.WAeUPKOFAUnitTestLayer
+    .. :layer: waeup.kofa.testing.WAeUPKofaUnitTestLayer
 
   Use it, if in your tests you make use of registered components like
