Merge branch doc-dc
authorThierry Florac <thierry.florac@onf.fr>
Fri, 27 Apr 2018 14:44:33 +0200
changeset 53 05a4f2c07b84
parent 46 5fe8d5ffccde (current diff)
parent 51 5ebe61e3a965 (diff)
child 54 e3d33ef363fd
child 57 e7d62e94392f
Merge branch doc-dc
requirements.txt
src/source/components.rst
src/source/config.rst
src/source/install.rst
src/source/site.rst
--- a/requirements.txt	Thu Apr 12 11:18:48 2018 +0200
+++ b/requirements.txt	Fri Apr 27 14:44:33 2018 +0200
@@ -4,40 +4,43 @@
 hypatia==0.3
 lxml==4.1.1
 Pillow==4.3.0
-pyams-alchemy==0.1.4
+pyams-alchemy==0.1.7
 pyams-cache==0.1.3
-pyams-catalog==0.1.6
-pyams-content==0.1.11
-pyams-content-es==0.1.8
-pyams-default-theme==0.1.2
-pyams-file==0.1.12
-pyams-form==0.1.10
-#pyams-gis==0.1.5
-pyams-i18n==0.1.10
-pyams-ldap==0.1.4
+pyams-catalog==0.1.8
+pyams-content==0.1.13
+pyams-content-es==0.1.10
+pyams-default-theme==0.1.4
+pyams-file==0.1.14
+pyams-form==0.1.12
+#pyams-gis==0.1.7
+pyams-i18n==0.1.12
+pyams-ldap==0.1.6
 pyams-mail==0.1.1
-pyams-media==0.1.10
-pyams-notify==0.1.5
+pyams-media==0.1.12
+pyams-notify==0.1.6
 pyams-notify-ws==0.1.4
 pyams-pagelet==0.1.1
-pyams-portal==0.1.8
-pyams-scheduler==0.1.8
-pyams-security==0.1.8
-pyams-sequence==0.1.6
-pyams-skin==0.1.13.1
+pyams-portal==0.1.10
+pyams-scheduler==0.1.10
+pyams-security==0.1.10
+pyams-sequence==0.1.8
+pyams-skin==0.1.15
 pyams-template==0.1.1
-pyams-thesaurus==0.1.6
-pyams-utils==0.1.11
-pyams-viewlet==0.1.2
-pyams-workflow==0.1.9
-pyams-zmi==0.1.6
-pyams-zmq==0.1.2
+pyams-thesaurus==0.1.8
+pyams-utils==0.1.14
+pyams-viewlet==0.1.3
+pyams-workflow==0.1.11
+pyams-zmi==0.1.8
+pyams-zmq==0.1.3
 pyams-zodbbrowser==0.1.2
 pyramid==1.9.1
 pyramid-es==0.3.2.dev2
 pyramid-fanstatic==0.5
 pyramid-zodbconn==0.7
 pyzmq==16.0.4
+repoze.sphinx.autointerface==0.8
+Sphinx==1.6.7
+sphinx_rtd_theme==0.2.4
 websockets==3.4
 WebOb==1.7.4
 ZODB==5.3.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/_static/css/custom.css	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,7 @@
+.wy-menu .caption-text{
+	color: #2D87C2;
+}
+
+.headerlink::before{
+	color: #2D87C2;
+}
Binary file src/source/_static/pyams-login.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/app.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,10 @@
+.. _app:
+
+Configuring and Running PyAMS
+=============================
+
+.. toctree::
+   :maxdepth: 2
+
+   appconfig
+   appstart
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/appconfig.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,80 @@
+.. _config:
+
+PyAMS configuration
+===================
+
+.. Note::
+
+    PyAMS application configuration is done via several complementary ways:
+
+        - via **Pyramid's configuration** files located in 'etc/' folder
+
+        - via **ZCML files** .
+
+        - via **Site Management** to setup Local utilities defined into ZODB (see :ref:`appmanage`)
+
+
+Pyramid's configuration files
+-----------------------------
+
+PyAMS is using default Pyramid's ini_ configuration files to define settings. When using default PyAMS scaffold, these
+INI files are stored into *etc* folder. Two files are created by scaffold: a development file (*development.ini*) and
+a production file (*production.ini*) which contain nearly the same directives, except for debug toolbar (activated only
+in development), Fanstatic configuration and logging.
+
+.. _ini: https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/project.html#development-ini
+
+These files are actually documented, but here are a few important directives:
+
+- **zodbconn.uri**: (ex: zconfig:/zodb-relstorage.conf)
+
+- **pyams.application_name**: Name of your own application
+- **pyams.application_factory**: Configuration module path to your custom application.
+
+- **pyams_xxx.tcp_handler** :  Adress of the tcp handler for the service associated to the pyams package
+- **pyams_xxx.start_handler**: True / False
+
+- **pyams_content.config.xxx_tool_factory** and **pyams_content.config.xxx_tool_name**: You can override default factory by defining these settings or by providing your own adapters.
+
+
+
+Pyramid's configuration files powered by PyAMS_utils
+----------------------------------------------------
+
+On application startup, if PyAMS_utils package is included into Pyramid configuration, several operations take
+place:
+
+ - a custom **site factory** is defined
+
+ - custom request methods are defined
+
+ - a custom **traverser** handling **namespaces** is defined
+
+ - a custom subscribers predicate based on interfaces support is defined
+
+ - several adapters are registered, to handle annotations and key references
+
+ - custom TALES extensions are registered.
+
+The site factory is an important component in this process. It is this factory which will define the application root
+and create a **local site manager**.
+
+Pyramid application is loaded from ZODB's root via a key defined in Pyramid's configuration file; the key is named
+*pyams.application_name* and it's default value is *application*.
+
+If the application can't be found, PyAMS is looking for an application class name in Pyramid's configuration file; the
+class name configuration key is called *pyams.application_factory* and defined by default as
+*pyams_utils.site.BaseSiteRoot*. PyAMS default site factory will then create the application, and add a local site
+manager to it (see :ref:`zca`).
+
+After application creation, a :py:class:`NewLocalSiteCreatedEvent <pyams_utils.site.NewLocalSiteCreatedEvent>` is
+notified. Custom packages can subscribe to this event to register custom components.
+
+
+
+ZCML configuration files
+------------------------
+
+Adding more ZCML configuration directives is not mandatory in any way but can be useful in several use cases. For
+example, templates can't be overriden via Python annotations without creating a new subclass; this can be done
+easily via ZCML.
--- a/src/source/appinstall.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/appinstall.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,5 +1,7 @@
 .. _appinstall:
 
+.. _install:
+
 Installing PyAMS application
 ============================
 
@@ -186,12 +188,19 @@
 
 **Then finalize Bootstrap initialization:**
 
-
 .. code-block:: bash
 
     (env) $ python3.5 bootstrap.py
     (env) $ ./bin/buildout
 
+
+.. seealso::
+
+    `zc.buildout <https://pypi.python.org/pypi/zc.buildout>`_ is a powerful
+    tool for creating repeatable builds of a given software configuration
+    and environment.
+
+
 Environment settings
 --------------------
 
@@ -217,8 +226,10 @@
 update them carefully before initializing your application database!
 
 
+.. _zodbinit:
+
 Initializing the ZODB database
-=========================
+==============================
 
 After, you have downloaded and installed all required packages, you have to initialize the database so that all
 required components are available.
@@ -308,96 +319,3 @@
 '*/usr/local/lib/nltk_data*'.
 
 
-Starting the application
-========================
-
-When database upgrade process has ended, you can start the web application process with the standard Pyramid's
-*pserve* command line tool:
-
-.. code-block:: bash
-
-    (env) $ ./bin/pserve etc/development.ini
-
-In standard debug mode, all registered components are displayed in the console, until the final line (here using ZEO):
-
-.. code-block:: bash
-
-    2018-01-14 11:37:54,339 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=28695) created RW/normal for storage: 'pyams'
-    2018-01-14 11:37:54,340 INFO  [ZEO.cache][MainThread] created temporary cache file 3
-    2018-01-14 11:37:54,345 INFO  [ZODB.blob][MainThread] (28695) Blob directory `/var/local/env/pyams/var/db/blobs` is used but has no layout marker set. Selected `lawn` layout.
-    2018-01-14 11:37:54,345 WARNI [ZODB.blob][MainThread] (28695) The `lawn` blob directory layout is deprecated due to scalability issues on some file systems, please consider migrating to the `bushy` layout.
-    2018-01-14 11:37:54,346 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
-    2018-01-14 11:37:54,347 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7feeb1de7390> None
-    2018-01-14 11:37:54,348 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
-    2018-01-14 11:37:54,349 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
-    2018-01-14 11:37:54,355 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
-    2018-01-14 11:37:54,358 DEBUG [txn.140663320073984][MainThread] new transaction
-    2018-01-14 11:37:54,360 DEBUG [txn.140663320073984][MainThread] commit
-    2018-01-14 11:37:54,484 DEBUG [config][MainThread] include /home/tflorac/Dropbox/src/PyAMS/pyams_template/src/pyams_template/configure.zcml
-    2018-01-14 11:37:54,485 DEBUG [config][MainThread] include /var/local/env/pycharm/lib/python3.5/site-packages/pyramid_zcml/configure.zcml
-    ...
-    2018-01-14 11:37:54,833 DEBUG [PyAMS (utils)][MainThread] Registering utility <class 'pyams_utils.timezone.utility.TimezoneGenerationsChecker'> named 'PyAMS timezone' providing <InterfaceClass pyams_utils.interfaces.site.ISiteGenerations>
-    2018-01-14 11:37:54,834 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.timezone.vocabulary.TimezonesVocabulary'> as vocabulary with name "PyAMS timezones"
-    2018-01-14 11:37:54,835 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.traversing.PathElementsAdapter'> for (<InterfaceClass zope.location.interfaces.IContained>,) providing <InterfaceClass pyams_utils.interfaces.traversing.IPathElements>
-    2018-01-14 11:37:54,839 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.url.AbsoluteUrlTalesExtension'> for (<InterfaceClass zope.interface.Interface>, <InterfaceClass zope.interface.Interface>, <InterfaceClass zope.interface.Interface>) providing <InterfaceClass pyams_utils.interfaces.tales.ITALESExtension>
-    2018-01-14 11:37:54,847 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.widget.decimal.DottedDecimalDataConverter'> for (<InterfaceClass pyams_utils.schema.IDottedDecimalField>, <InterfaceClass z3c.form.interfaces.IWidget>) providing <InterfaceClass z3c.form.interfaces.IDataConverter>
-    2018-01-14 11:37:54,942 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.zmi.intids.IntIdsLengthAdapter'> for (<InterfaceClass zope.intid.interfaces.IIntIds>,) providing <InterfaceClass pyams_utils.interfaces.intids.IIndexLength>
-    2018-01-14 11:37:54,943 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass zope.intid.interfaces.IIntIds> (<class 'pyams_utils.zmi.intids.IntIdsPropertiesDisplayForm'>)
-    2018-01-14 11:37:54,949 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass pyams_utils.interfaces.timezone.IServerTimezone> (<class 'pyams_utils.zmi.timezone.ServerTimezonePropertiesEditForm'>)
-    2018-01-14 11:37:54,980 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.zodb.ZEOConnectionVocabulary'> as vocabulary with name "PyAMS ZEO connections"
-    2018-01-14 11:37:54,981 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.zodb.ZODBConnectionVocabulary'> as vocabulary with name "PyAMS ZODB connections"
-    2018-01-14 11:37:55,015 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "add-zeo-connection.html" for <InterfaceClass zope.component.interfaces.ISite> (<class 'pyams_utils.zmi.zeo.ZEOConnectionAddForm'>)
-    2018-01-14 11:37:55,016 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.zmi.zeo.ZEOConnectionNameAdapter'> for (<InterfaceClass pyams_utils.interfaces.zeo.IZEOConnection>, <InterfaceClass pyams_zmi.layer.IAdminLayer>) providing <InterfaceClass pyams_skin.interfaces.container.ITableElementName>
-    2018-01-14 11:37:55,017 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass pyams_utils.interfaces.zeo.IZEOConnection> (<class 'pyams_utils.zmi.zeo.ZEOConnectionPropertiesEditForm'>)
-    ...
-    2018-01-14 11:41:13,214 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_default_theme.skin.ResourcesAdapter'> for (<InterfaceClass zope.interface.Interface>, <InterfaceClass pyams_default_theme.layer.IPyAMSDefaultLayer>, <InterfaceClass zope.interface.Interface>) providing <InterfaceClass pyams_skin.interfaces.resources.IResources>
-    2018-01-14 11:43:36,665 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=29335) created RW/normal for storage: 'pyams'
-    2018-01-14 11:43:36,665 INFO  [ZEO.cache][MainThread] created temporary cache file 9
-    2018-01-14 11:43:36,673 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
-    2018-01-14 11:43:36,674 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328 Checking blob cache size. (target: 966367642)
-    2018-01-14 11:43:36,674 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7ffa54058860> None
-    2018-01-14 11:43:36,675 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   blob cache size: 0
-    2018-01-14 11:43:36,675 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
-    2018-01-14 11:43:36,675 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   -->
-    2018-01-14 11:43:36,677 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
-    2018-01-14 11:43:36,679 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
-    2018-01-14 11:43:36,682 DEBUG [txn.140713340237568][MainThread] new transaction
-    2018-01-14 11:43:36,683 DEBUG [txn.140713340237568][MainThread] commit
-    2018-01-14 11:43:36,690 INFO  [PyAMS (scheduler][MainThread] Starting tasks scheduler <SchedulerProcess(SchedulerProcess-1, initial)>...
-    2018-01-14 11:43:36,698 INFO  [PyAMS (scheduler][MainThread] Started tasks scheduler with PID 29361.
-    2018-01-14 11:43:36,701 INFO  [apscheduler.scheduler][MainThread] Scheduler started
-    2018-01-14 11:43:36,702 DEBUG [apscheduler.scheduler][APScheduler] Looking for jobs to run
-    2018-01-14 11:43:36,704 DEBUG [apscheduler.scheduler][APScheduler] No jobs; waiting until a job is added
-    2018-01-14 11:43:36,719 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=29335) created RW/normal for storage: 'pyams'
-    2018-01-14 11:43:36,720 INFO  [ZEO.cache][MainThread] created temporary cache file 15
-    2018-01-14 11:43:36,724 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
-    2018-01-14 11:43:36,725 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7ffa557e8b00> None
-    2018-01-14 11:43:36,726 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
-    2018-01-14 11:43:36,727 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328 Checking blob cache size. (target: 966367642)
-    2018-01-14 11:43:36,728 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
-    2018-01-14 11:43:36,729 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   blob cache size: 0
-    2018-01-14 11:43:36,729 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   -->
-    2018-01-14 11:43:36,732 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
-    2018-01-14 11:43:36,735 DEBUG [txn.140713340237568][MainThread] new transaction
-    2018-01-14 11:43:36,736 DEBUG [txn.140713340237568][MainThread] commit
-    2018-01-14 11:43:36,743 INFO  [PyAMS (media)][MainThread] Starting medias converter <MediaConversionProcess(MediaConversionProcess-2, initial)>...
-    2018-01-14 11:43:36,751 INFO  [PyAMS (media)][MainThread] Started medias converter with PID 29367.
-    Starting server in PID 29335.
-    Serving on http://0.0.0.0:6543
-
-
-Congrats: PyAMS is running !
-
-Launch a browser and open URL http://127.0.0.1:6543/admin to get access to PyAMS management interface.
-
-.. warning::
-
-    By default:
-
-    - Login: admin
-
-    - Password: admin
-
-    **You must change it as soon as possible!**
-    (see :ref:`pyams_security`)!!.
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/appmanage.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,53 @@
+.. _appmanage:
+
+.. _site:
+
+
+PyAMS admin site
+================
+
+PyAMS admin site (called also **ZMI**, in memory of old **\Z**\ope **\M**\anagement **\I**\nterface) is based on the ZODB.
+
+When the PyAMS is initialized, it create and register several utilities into the *local registry* and saved into ZODB.
+These utilities are created with default values which can be modified through **management interface** when
+the application is started.
+
+
+Local registry utilities
+''''''''''''''''''''''''
+
+One of PyAMS pre-requisites is to use the ZODB, at least to store the site root application,
+it's configuration and a set of local utilities.
+
+Some important utilities include:
+
+- a **catalog**: the catalog has the responsibility to index every content properties which are required to make quick
+  and efficient searches. Catalog indexes are automatically created on database upgrade; management interface
+  allows administrator to get indexes properties, to get the number of indexed objects and values for a given index, and
+  to delete an index before recreating it by running the database upgrade script another time (see :ref:`scripts`).
+
+- an **internal IDs** utility:
+
+- a **language negotiator**:
+
+- a **portal templates** container:
+
+- a **security manager**:
+
+- a **sequential IDs** utility:
+
+- a **server timezone** utility:
+
+- a **user profiles** container:
+
+
+Optional utilities can also include:
+
+- an **Elasticsearch content indexer**:
+
+- a **maps manager**:
+
+- a **medias converter**:
+
+- a **tasks scheduler**:
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/appstart.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,95 @@
+.. _appstart:
+
+Starting the application
+========================
+
+When database upgrade process has ended ( :ref:`zodbinit` ) , you can start the web application process with the standard Pyramid's
+*pserve* command line tool:
+
+.. code-block:: bash
+
+    (env) $ ./bin/pserve etc/development.ini
+
+In standard debug mode, all registered components are displayed in the console, until the final line (here using ZEO):
+
+.. code-block:: bash
+
+    2018-01-14 11:37:54,339 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=28695) created RW/normal for storage: 'pyams'
+    2018-01-14 11:37:54,340 INFO  [ZEO.cache][MainThread] created temporary cache file 3
+    2018-01-14 11:37:54,345 INFO  [ZODB.blob][MainThread] (28695) Blob directory `/var/local/env/pyams/var/db/blobs` is used but has no layout marker set. Selected `lawn` layout.
+    2018-01-14 11:37:54,345 WARNI [ZODB.blob][MainThread] (28695) The `lawn` blob directory layout is deprecated due to scalability issues on some file systems, please consider migrating to the `bushy` layout.
+    2018-01-14 11:37:54,346 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
+    2018-01-14 11:37:54,347 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7feeb1de7390> None
+    2018-01-14 11:37:54,348 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
+    2018-01-14 11:37:54,349 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
+    2018-01-14 11:37:54,355 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
+    2018-01-14 11:37:54,358 DEBUG [txn.140663320073984][MainThread] new transaction
+    2018-01-14 11:37:54,360 DEBUG [txn.140663320073984][MainThread] commit
+    2018-01-14 11:37:54,484 DEBUG [config][MainThread] include /home/tflorac/Dropbox/src/PyAMS/pyams_template/src/pyams_template/configure.zcml
+    2018-01-14 11:37:54,485 DEBUG [config][MainThread] include /var/local/env/pycharm/lib/python3.5/site-packages/pyramid_zcml/configure.zcml
+    ...
+    2018-01-14 11:37:54,833 DEBUG [PyAMS (utils)][MainThread] Registering utility <class 'pyams_utils.timezone.utility.TimezoneGenerationsChecker'> named 'PyAMS timezone' providing <InterfaceClass pyams_utils.interfaces.site.ISiteGenerations>
+    2018-01-14 11:37:54,834 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.timezone.vocabulary.TimezonesVocabulary'> as vocabulary with name "PyAMS timezones"
+    2018-01-14 11:37:54,835 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.traversing.PathElementsAdapter'> for (<InterfaceClass zope.location.interfaces.IContained>,) providing <InterfaceClass pyams_utils.interfaces.traversing.IPathElements>
+    2018-01-14 11:37:54,839 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.url.AbsoluteUrlTalesExtension'> for (<InterfaceClass zope.interface.Interface>, <InterfaceClass zope.interface.Interface>, <InterfaceClass zope.interface.Interface>) providing <InterfaceClass pyams_utils.interfaces.tales.ITALESExtension>
+    2018-01-14 11:37:54,847 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.widget.decimal.DottedDecimalDataConverter'> for (<InterfaceClass pyams_utils.schema.IDottedDecimalField>, <InterfaceClass z3c.form.interfaces.IWidget>) providing <InterfaceClass z3c.form.interfaces.IDataConverter>
+    2018-01-14 11:37:54,942 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.zmi.intids.IntIdsLengthAdapter'> for (<InterfaceClass zope.intid.interfaces.IIntIds>,) providing <InterfaceClass pyams_utils.interfaces.intids.IIndexLength>
+    2018-01-14 11:37:54,943 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass zope.intid.interfaces.IIntIds> (<class 'pyams_utils.zmi.intids.IntIdsPropertiesDisplayForm'>)
+    2018-01-14 11:37:54,949 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass pyams_utils.interfaces.timezone.IServerTimezone> (<class 'pyams_utils.zmi.timezone.ServerTimezonePropertiesEditForm'>)
+    2018-01-14 11:37:54,980 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.zodb.ZEOConnectionVocabulary'> as vocabulary with name "PyAMS ZEO connections"
+    2018-01-14 11:37:54,981 DEBUG [PyAMS (utils)][MainThread] Registering class <class 'pyams_utils.zodb.ZODBConnectionVocabulary'> as vocabulary with name "PyAMS ZODB connections"
+    2018-01-14 11:37:55,015 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "add-zeo-connection.html" for <InterfaceClass zope.component.interfaces.ISite> (<class 'pyams_utils.zmi.zeo.ZEOConnectionAddForm'>)
+    2018-01-14 11:37:55,016 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_utils.zmi.zeo.ZEOConnectionNameAdapter'> for (<InterfaceClass pyams_utils.interfaces.zeo.IZEOConnection>, <InterfaceClass pyams_zmi.layer.IAdminLayer>) providing <InterfaceClass pyams_skin.interfaces.container.ITableElementName>
+    2018-01-14 11:37:55,017 DEBUG [PyAMS (pagelet)][MainThread] Registering pagelet view "properties.html" for <InterfaceClass pyams_utils.interfaces.zeo.IZEOConnection> (<class 'pyams_utils.zmi.zeo.ZEOConnectionPropertiesEditForm'>)
+    ...
+    2018-01-14 11:41:13,214 DEBUG [PyAMS (utils)][MainThread] Registering adapter <class 'pyams_default_theme.skin.ResourcesAdapter'> for (<InterfaceClass zope.interface.Interface>, <InterfaceClass pyams_default_theme.layer.IPyAMSDefaultLayer>, <InterfaceClass zope.interface.Interface>) providing <InterfaceClass pyams_skin.interfaces.resources.IResources>
+    2018-01-14 11:43:36,665 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=29335) created RW/normal for storage: 'pyams'
+    2018-01-14 11:43:36,665 INFO  [ZEO.cache][MainThread] created temporary cache file 9
+    2018-01-14 11:43:36,673 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
+    2018-01-14 11:43:36,674 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328 Checking blob cache size. (target: 966367642)
+    2018-01-14 11:43:36,674 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7ffa54058860> None
+    2018-01-14 11:43:36,675 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   blob cache size: 0
+    2018-01-14 11:43:36,675 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
+    2018-01-14 11:43:36,675 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   -->
+    2018-01-14 11:43:36,677 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
+    2018-01-14 11:43:36,679 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
+    2018-01-14 11:43:36,682 DEBUG [txn.140713340237568][MainThread] new transaction
+    2018-01-14 11:43:36,683 DEBUG [txn.140713340237568][MainThread] commit
+    2018-01-14 11:43:36,690 INFO  [PyAMS (scheduler][MainThread] Starting tasks scheduler <SchedulerProcess(SchedulerProcess-1, initial)>...
+    2018-01-14 11:43:36,698 INFO  [PyAMS (scheduler][MainThread] Started tasks scheduler with PID 29361.
+    2018-01-14 11:43:36,701 INFO  [apscheduler.scheduler][MainThread] Scheduler started
+    2018-01-14 11:43:36,702 DEBUG [apscheduler.scheduler][APScheduler] Looking for jobs to run
+    2018-01-14 11:43:36,704 DEBUG [apscheduler.scheduler][APScheduler] No jobs; waiting until a job is added
+    2018-01-14 11:43:36,719 INFO  [ZEO.ClientStorage][MainThread] [('127.0.0.1', 8100)] ClientStorage (pid=29335) created RW/normal for storage: 'pyams'
+    2018-01-14 11:43:36,720 INFO  [ZEO.cache][MainThread] created temporary cache file 15
+    2018-01-14 11:43:36,724 DEBUG [asyncio][[('127.0.0.1', 8100)] zeo client networking thread] Using selector: EpollSelector
+    2018-01-14 11:43:36,725 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] disconnected <ZEO.asyncio.client.Client object at 0x7ffa557e8b00> None
+    2018-01-14 11:43:36,726 DEBUG [ZEO.asyncio.client][[('127.0.0.1', 8100)] zeo client networking thread] try_connecting
+    2018-01-14 11:43:36,727 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328 Checking blob cache size. (target: 966367642)
+    2018-01-14 11:43:36,728 INFO  [ZEO.asyncio.base][[('127.0.0.1', 8100)] zeo client networking thread] Connected Protocol(('127.0.0.1', 8100), 'pyams', False)
+    2018-01-14 11:43:36,729 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   blob cache size: 0
+    2018-01-14 11:43:36,729 DEBUG [ZEO.ClientStorage.check_blob_cache][[('127.0.0.1', 8100)] zeo client check blob size thread] 140712483907328   -->
+    2018-01-14 11:43:36,732 INFO  [ZEO.ClientStorage][[('127.0.0.1', 8100)] zeo client networking thread] [('127.0.0.1', 8100)] Connected to storage: ('localhost', 8100)
+    2018-01-14 11:43:36,735 DEBUG [txn.140713340237568][MainThread] new transaction
+    2018-01-14 11:43:36,736 DEBUG [txn.140713340237568][MainThread] commit
+    2018-01-14 11:43:36,743 INFO  [PyAMS (media)][MainThread] Starting medias converter <MediaConversionProcess(MediaConversionProcess-2, initial)>...
+    2018-01-14 11:43:36,751 INFO  [PyAMS (media)][MainThread] Started medias converter with PID 29367.
+    Starting server in PID 29335.
+    Serving on http://0.0.0.0:6543
+
+
+Congrats: PyAMS is running !
+
+Launch a browser and open URL http://127.0.0.1:6543/admin to get access to PyAMS management interface.
+
+.. warning::
+
+    By default:
+
+    - Login: admin
+
+    - Password: admin
+
+    **You must change it as soon as possible!**
+    (see :ref:`pyams_security`)!!.
+
--- a/src/source/components.rst	Thu Apr 12 11:18:48 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-.. _components:
-
-Custom PyAMS components
-=======================
-
-.. toctree::
-   :maxdepth: 2
-
-   traverser
-   tales
--- a/src/source/conf.py	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/conf.py	Fri Apr 27 14:44:33 2018 +0200
@@ -69,10 +69,13 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode'
+    #'sphinx.ext.coverage',
+    'sphinx.ext.viewcode',
+    'repoze.sphinx.autointerface',
 ]
 
+autoclass_content = 'both'
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -235,3 +238,8 @@
         else:
             return super(self.__class__, self).__doc__
     FieldProperty.__doc__ = property(get_field_doc)
+
+
+def setup(app):
+    app.add_stylesheet('css/custom.css')
+
--- a/src/source/config.rst	Thu Apr 12 11:18:48 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-.. _config:
-
-PyAMS configuration
-===================
-
-PyAMS application configuration is done via several complementary ways:
-
-- via Pyramid's configuration files located in 'etc/' folder
-
-- via settings applied to local utilities defined into ZODB
-
-- via ZCML files.
-
-
-Pyramid's configuration files
------------------------------
-
-PyAMS is using default Pyramid's configuration files to define settings. When using default PyAMS scaffold, these
-INI files are stored into *etc* folder. Two files are created by scaffold: a development file (*development.ini*) and
-a production file (*production.ini*) which contain nearly the same directives, except for debug toolbar (activated only
-in development), Fanstatic configuration and logging.
-
-These files are actually documented, but here are a few important directives:
-
-- **zodbconn.uri**:
-
-- **pyams.application_factory**:
-
-- **pyams.application_name**:
-
-- **pyams_xxx.tcp_handler** and **pyams_xxx.start_handler**:
-
-- **pyams_content.config.tools_name**:
-
-- **pyams_content.config.xxx_tool_factory** and **pyams_content.config.xxx_tool_name**:
-
-
-Local registry utilities
-------------------------
-
-When the ZODB is created, PyAMS automatically create and register several utilities into the *local registry* (see
-:ref:`zca`). These utilities are created with default values which can be modified through management interface when
-the application is started.
-
-Some important utilities include:
-
-- a **catalog**: the catalog has the responsibility to index every content properties which are required to make quick
-  and efficient searches. Catalog indexes are automatically created on database upgrade; management interface
-  allows administrator to get indexes properties, to get the number of indexed objects and values for a given index, and
-  to delete an index before recreating it by running the database upgrade script another time (see :ref:`scripts`).
-
-- an **internal IDs** utility:
-
-- a **language negotiator**:
-
-- a **portal templates** container:
-
-- a **security manager**:
-
-- a **sequential IDs** utility:
-
-- a **server timezone** utility:
-
-- a **user profiles** container:
-
-
-Optional utilities can also include:
-
-- an **Elasticsearch content indexer**:
-
-- a **maps manager**:
-
-- a **medias converter**:
-
-- a **tasks scheduler**:
-
-
-ZCML configuration files
-------------------------
-
-Adding more ZCML configuration directives is not mandatory in any way but can be useful in several use cases. For
-example, templates can't be overriden via Python annotations without creating a new subclass; this can be done
-easily via ZCML.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/developerguide.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,14 @@
+.. _developerguide:
+
+
+Developer's Guide
+=================
+
+PyAMS packages are developed based on ZCA
+
+
+.. toctree::
+   :maxdepth: 2
+
+   zca
+   extend
--- a/src/source/extend.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/extend.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -6,5 +6,8 @@
 .. toctree::
    :maxdepth: 2
 
-   zca
-   components
+   package_layout
+   traverser
+   tales
+
+
--- a/src/source/index.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/index.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -24,7 +24,7 @@
    :maxdepth: 2
    :caption: Tutorial
 
-   User’s Guide <manage>
+   User’s Guide <userguide>
    screenshots
 
 .. toctree::
@@ -32,33 +32,31 @@
    :caption: Custom install documentation
 
    ZODB Server <zodb>
-   PyAMS Installation <install>
-   PyAMS Configuration <config>
-   site
-   scripts
+   PyAMS Installation <appinstall>
+   Configuring and Running PyAMS <app>
+   PyAMS Site management (ZMI)<manage>
 
 
 
 
-PyAMS external packages
------------------------
+.. toctree::
+   :maxdepth: 2
+   :caption:  Technical documentation
 
-PyAMS is built on many external packages, and provides a whole set of extensions. Here is a list of them:
-
+   developerguide
+   packages
+   tests
 
 .. toctree::
    :maxdepth: 2
-   :caption:  API documentation
+   :caption:  Toolkit
 
-   extend
-   packages
-
+   scripts
 
 
 Indices and tables
 ------------------
 
 * :ref:`genindex`
-* :ref:`modules`
 * :ref:`modindex`
 * :ref:`search`
--- a/src/source/install.rst	Thu Apr 12 11:18:48 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-.. _install:
-
-Installing PyAMS
-================
-
-.. toctree::
-   :maxdepth: 2
-
-   appinstall
-
--- a/src/source/manage.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/manage.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -6,5 +6,7 @@
 .. toctree::
    :maxdepth: 2
 
+   appmanage
    utilities
 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/package_layout.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,20 @@
+PyAMS Package directory layout
+------------------------------
+
+.. code-block:: bash
+
+
+    ├── pyams_<package>/
+    │   ├── doctests/       <- Documentation for the package
+    │   ├── interfaces/     <- Interfaces definition
+    │   ├── locales/        <- Store source code translation files (.mo .pot)
+    │   ├── tests/          <- Contains python scripts for running tests including test runners, unit test
+    │   ├── zmi/            <- ZMI subpackage to register and define elements in admin interface
+    │   ├── __init__.py
+    │   ├── include.py      <- Register Pyramid directives
+    │   ├── configure.zcml  <- Overload default Zope config directive (optional)
+    :   :.. <module>.py     <- source code
+    :   :
+    │   └── site.py
+
+    ...
--- a/src/source/packages.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/packages.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -3,33 +3,49 @@
 PyAMS packages
 ==============
 
+
+PyAMS core
+----------
+
+.. toctree::
+   :maxdepth: 1
+
+   PyAMS ZMI <pyams_zmi/pyams_zmi>
+   PyAMS Content <pyams_content/pyams_content>
+   PyAMS Skin <pyams_skin/pyams_skin>
+   PyAMS Catalog <pyams_catalog/pyams_catalog>
+   PyAMS Form <pyams_form/pyams_form>
+   PyAMS Portal <pyams_portal/pyams_portal>
+   PyAMS Template <pyams_template/pyams_template>
+   PyAMS Pagelet <pyams_pagelet/pyams_pagelet>
+   PyAMS Viewlet <pyams_viewlet/pyams_viewlet>
+   PyAMS Utils <pyams_utils/pyams_utils>
+
+
+PyAMS additional packages
+-------------------------
+
+PyAMS is built on many additional packages, and provides a whole set of extensions. Here is a list of them:
+
 .. toctree::
    :maxdepth: 1
 
    PyAMS Alchemy  <pyams_alchemy/pyams_alchemy>
    PyAMS Cache <pyams_cache/pyams_cache>
-   PyAMS Catalog <pyams_catalog/pyams_catalog>
-   PyAMS Content <pyams_content/pyams_content>
    PyAMS Content_es <pyams_content_es/pyams_content_es>
+   PyAMS Default theme <pyams_default_theme/pyams_default_theme>
    PyAMS File <pyams_file/pyams_file>
-   PyAMS Form <pyams_form/pyams_form>
    PyAMS GIS <pyams_gis/pyams_gis>
    PyAMS I18N <pyams_i18n/pyams_i18n>
    PyAMS LDAP <pyams_ldap/pyams_ldap>
    PyAMS Mail <pyams_mail/pyams_mail>
    PyAMS Media <pyams_media/pyams_media>
    PyAMS Notify <pyams_notify/pyams_notify>
-   PyAMS Pagelet <pyams_pagelet/pyams_pagelet>
-   PyAMS Portal <pyams_portal/pyams_portal>
+   PyAMS Notify <pyams_notify_ws/pyams_notify_ws>
    PyAMS Scheduler <pyams_scheduler/pyams_scheduler>
+   PyAMS Thesaurus <pyams_thesaurus/pyams_thesaurus>
    PyAMS Security <pyams_security/pyams_security>
    PyAMS Sequence <pyams_sequence/pyams_sequence>
-   PyAMS Skin <pyams_skin/pyams_skin>
-   PyAMS Template <pyams_template/pyams_template>
-   PyAMS Thesaurus <pyams_thesaurus/pyams_thesaurus>
-   PyAMS Utils <pyams_utils/pyams_utils>
-   PyAMS Viewlet <pyams_viewlet/pyams_viewlet>
    PyAMS Workflow <pyams_workflow/pyams_workflow>
-   PyAMS ZMI <pyams_zmi/pyams_zmi>
    PyAMS ZMQ <pyams_zmq/pyams_zmq>
    PyAMS ZODBbrowser <pyams_zodbbrowser/pyams_zodbbrowser>
--- a/src/source/pyams_alchemy/pyams_alchemy.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_alchemy/pyams_alchemy.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_alchemy.interfaces:
 
-pyams_alchemy.interfaces package
-================================
+\ :mod:`pyams_alchemy.interfaces` package
+=========================================
 
 .. automodule:: pyams_alchemy.interfaces
     :members:
--- a/src/source/pyams_alchemy/pyams_alchemy.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_alchemy/pyams_alchemy.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_alchemy:
 
-pyams_alchemy package
-=====================
+\ :mod:`pyams_alchemy` package
+==============================
 
 .. automodule:: pyams_alchemy
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_alchemy\.engine module
------------------------------
+pyams_alchemy.\ ``engine``
+--------------------------
 
 .. automodule:: pyams_alchemy.engine
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_alchemy\.loader module
------------------------------
+pyams_alchemy.\ ``loader``
+--------------------------
 
 .. automodule:: pyams_alchemy.loader
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_alchemy\.metaconfigure module
-------------------------------------
+pyams_alchemy.\ ``metaconfigure``
+---------------------------------
 
 .. automodule:: pyams_alchemy.metaconfigure
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_alchemy\.metadirectives module
--------------------------------------
+pyams_alchemy.\ ``metadirectives``
+----------------------------------
 
 .. automodule:: pyams_alchemy.metadirectives
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_alchemy\.mixin module
-----------------------------
+pyams_alchemy.\ ``mixin``
+-------------------------
 
 .. automodule:: pyams_alchemy.mixin
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_alchemy/pyams_alchemy.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_alchemy/pyams_alchemy.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_alchemy.tests:
 
-pyams_alchemy.tests package
-===========================
+\ :mod:`pyams_alchemy.tests` package
+====================================
 
 .. automodule:: pyams_alchemy.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_alchemy\.tests\.test\_utilsdocs module
----------------------------------------------
+pyams_alchemy.tests.\ ``test_utilsdocs``
+----------------------------------------
 
 .. automodule:: pyams_alchemy.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_alchemy\.tests\.test\_utilsdocstrings module
----------------------------------------------------
+pyams_alchemy.tests.\ ``test_utilsdocstrings``
+----------------------------------------------
 
 .. automodule:: pyams_alchemy.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_alchemy/pyams_alchemy.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_alchemy/pyams_alchemy.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_alchemy.zmi:
 
-pyams_alchemy.zmi package
-=========================
+\ :mod:`pyams_alchemy.zmi` package
+==================================
 
 .. automodule:: pyams_alchemy.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_alchemy\.zmi\.engine module
-----------------------------------
+pyams_alchemy.zmi.\ ``engine``
+------------------------------
 
 .. automodule:: pyams_alchemy.zmi.engine
     :members:
--- a/src/source/pyams_cache/pyams_cache.handler.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_cache/pyams_cache.handler.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_cache.handler:
 
-pyams_cache.handler package
-===========================
+\ :mod:`pyams_cache.handler` package
+====================================
 
 .. automodule:: pyams_cache.handler
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_cache\.handler\.memcached module
----------------------------------------
+pyams_cache.handler.\ ``memcached``
+-----------------------------------
 
 .. automodule:: pyams_cache.handler.memcached
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_cache\.handler\.redis module
------------------------------------
+pyams_cache.handler.\ ``redis``
+-------------------------------
 
 .. automodule:: pyams_cache.handler.redis
     :members:
--- a/src/source/pyams_cache/pyams_cache.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_cache/pyams_cache.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_cache.interfaces:
 
-pyams_cache.interfaces package
-==============================
+\ :mod:`pyams_cache.interfaces` package
+=======================================
 
 .. automodule:: pyams_cache.interfaces
     :members:
--- a/src/source/pyams_cache/pyams_cache.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_cache/pyams_cache.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_cache:
 
-pyams_cache package
-===================
+\ :mod:`pyams_cache` package
+============================
 
 .. automodule:: pyams_cache
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_cache\.beaker module
----------------------------
+pyams_cache.\ ``beaker``
+------------------------
 
 .. automodule:: pyams_cache.beaker
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_cache\.cache module
---------------------------
+pyams_cache.\ ``cache``
+-----------------------
 
 .. automodule:: pyams_cache.cache
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_cache\.include module
-----------------------------
+pyams_cache.\ ``include``
+-------------------------
 
 .. automodule:: pyams_cache.include
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_cache/pyams_cache.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_cache/pyams_cache.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_cache.tests:
 
-pyams_cache.tests package
-=========================
+\ :mod:`pyams_cache.tests` package
+==================================
 
 .. automodule:: pyams_cache.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_cache\.tests\.test\_utilsdocs module
--------------------------------------------
+pyams_cache.tests.\ ``test_utilsdocs``
+--------------------------------------
 
 .. automodule:: pyams_cache.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_cache\.tests\.test\_utilsdocstrings module
--------------------------------------------------
+pyams_cache.tests.\ ``test_utilsdocstrings``
+--------------------------------------------
 
 .. automodule:: pyams_cache.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_catalog/pyams_catalog.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_catalog/pyams_catalog.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_catalog.interfaces:
 
-pyams_catalog.interfaces package
-================================
+\ :mod:`pyams_catalog.interfaces` package
+=========================================
 
 .. automodule:: pyams_catalog.interfaces
     :members:
--- a/src/source/pyams_catalog/pyams_catalog.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_catalog/pyams_catalog.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_catalog:
 
-pyams_catalog package
-=====================
+\ :mod:`pyams_catalog` package
+==============================
 
 .. automodule:: pyams_catalog
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_catalog\.include module
-------------------------------
+pyams_catalog.\ ``include``
+---------------------------
 
 .. automodule:: pyams_catalog.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.index module
-----------------------------
+pyams_catalog.\ ``index``
+-------------------------
 
 .. automodule:: pyams_catalog.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.nltk module
----------------------------
+pyams_catalog.\ ``nltk``
+------------------------
 
 .. automodule:: pyams_catalog.nltk
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.query module
-----------------------------
+pyams_catalog.\ ``query``
+-------------------------
 
 .. automodule:: pyams_catalog.query
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.site module
----------------------------
+pyams_catalog.\ ``site``
+------------------------
 
 .. automodule:: pyams_catalog.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.utils module
-----------------------------
+pyams_catalog.\ ``utils``
+-------------------------
 
 .. automodule:: pyams_catalog.utils
     :members:
@@ -61,7 +58,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_catalog/pyams_catalog.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_catalog/pyams_catalog.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_catalog.tests:
 
-pyams_catalog.tests package
-===========================
+\ :mod:`pyams_catalog.tests` package
+====================================
 
 .. automodule:: pyams_catalog.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_catalog\.tests\.test\_utilsdocs module
----------------------------------------------
+pyams_catalog.tests.\ ``test_utilsdocs``
+----------------------------------------
 
 .. automodule:: pyams_catalog.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_catalog\.tests\.test\_utilsdocstrings module
----------------------------------------------------
+pyams_catalog.tests.\ ``test_utilsdocstrings``
+----------------------------------------------
 
 .. automodule:: pyams_catalog.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_catalog/pyams_catalog.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_catalog/pyams_catalog.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_catalog.zmi:
 
-pyams_catalog.zmi package
-=========================
+\ :mod:`pyams_catalog.zmi` package
+==================================
 
 .. automodule:: pyams_catalog.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_catalog\.zmi\.catalog module
------------------------------------
+pyams_catalog.zmi.\ ``catalog``
+-------------------------------
 
 .. automodule:: pyams_catalog.zmi.catalog
     :members:
--- a/src/source/pyams_content/pyams_content.component.association.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.association.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.association.interfaces:
 
-pyams_content.component.association.interfaces package
-======================================================
+\ :mod:`pyams_content.component.association.interfaces` package
+===============================================================
 
 .. automodule:: pyams_content.component.association.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.association.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.association.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.component.association:
 
-pyams_content.component.association package
-===========================================
+\ :mod:`pyams_content.component.association` package
+====================================================
 
 .. automodule:: pyams_content.component.association
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.association\.container module
---------------------------------------------------------
+pyams_content.component.association.\ ``container``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.association.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.association\.paragraph module
---------------------------------------------------------
+pyams_content.component.association.\ ``paragraph``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.association.paragraph
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.association.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.association.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.component.association.zmi:
 
-pyams_content.component.association.zmi package
-===============================================
+\ :mod:`pyams_content.component.association.zmi` package
+========================================================
 
 .. automodule:: pyams_content.component.association.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.association\.zmi\.interfaces module
---------------------------------------------------------------
+pyams_content.component.association.zmi.\ ``interfaces``
+--------------------------------------------------------
 
 .. automodule:: pyams_content.component.association.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.association\.zmi\.paragraph module
--------------------------------------------------------------
+pyams_content.component.association.zmi.\ ``paragraph``
+-------------------------------------------------------
 
 .. automodule:: pyams_content.component.association.zmi.paragraph
     :members:
--- a/src/source/pyams_content/pyams_content.component.extfile.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.extfile.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.extfile.interfaces:
 
-pyams_content.component.extfile.interfaces package
-==================================================
+\ :mod:`pyams_content.component.extfile.interfaces` package
+===========================================================
 
 .. automodule:: pyams_content.component.extfile.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.extfile.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.extfile.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.extfile:
 
-pyams_content.component.extfile package
-=======================================
+\ :mod:`pyams_content.component.extfile` package
+================================================
 
 .. automodule:: pyams_content.component.extfile
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.extfile.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.extfile.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.extfile.zmi:
 
-pyams_content.component.extfile.zmi package
-===========================================
+\ :mod:`pyams_content.component.extfile.zmi` package
+====================================================
 
 .. automodule:: pyams_content.component.extfile.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.extfile\.zmi\.container module
----------------------------------------------------------
+pyams_content.component.extfile.zmi.\ ``container``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.extfile.zmi.container
     :members:
--- a/src/source/pyams_content/pyams_content.component.gallery.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.gallery.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.gallery.interfaces:
 
-pyams_content.component.gallery.interfaces package
-==================================================
+\ :mod:`pyams_content.component.gallery.interfaces` package
+===========================================================
 
 .. automodule:: pyams_content.component.gallery.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.gallery.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.gallery.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.component.gallery:
 
-pyams_content.component.gallery package
-=======================================
+\ :mod:`pyams_content.component.gallery` package
+================================================
 
 .. automodule:: pyams_content.component.gallery
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.gallery\.file module
------------------------------------------------
+pyams_content.component.gallery.\ ``file``
+------------------------------------------
 
 .. automodule:: pyams_content.component.gallery.file
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.gallery\.paragraph module
-----------------------------------------------------
+pyams_content.component.gallery.\ ``paragraph``
+-----------------------------------------------
 
 .. automodule:: pyams_content.component.gallery.paragraph
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.gallery.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.gallery.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.component.gallery.zmi:
 
-pyams_content.component.gallery.zmi package
-===========================================
+\ :mod:`pyams_content.component.gallery.zmi` package
+====================================================
 
 .. automodule:: pyams_content.component.gallery.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.gallery\.zmi\.file module
-----------------------------------------------------
+pyams_content.component.gallery.zmi.\ ``file``
+----------------------------------------------
 
 .. automodule:: pyams_content.component.gallery.zmi.file
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.gallery\.zmi\.interfaces module
-----------------------------------------------------------
+pyams_content.component.gallery.zmi.\ ``interfaces``
+----------------------------------------------------
 
 .. automodule:: pyams_content.component.gallery.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.gallery\.zmi\.paragraph module
----------------------------------------------------------
+pyams_content.component.gallery.zmi.\ ``paragraph``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.gallery.zmi.paragraph
     :members:
--- a/src/source/pyams_content/pyams_content.component.illustration.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.illustration.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.illustration.interfaces:
 
-pyams_content.component.illustration.interfaces package
-=======================================================
+\ :mod:`pyams_content.component.illustration.interfaces` package
+================================================================
 
 .. automodule:: pyams_content.component.illustration.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.illustration.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.illustration.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.illustration:
 
-pyams_content.component.illustration package
-============================================
+\ :mod:`pyams_content.component.illustration` package
+=====================================================
 
 .. automodule:: pyams_content.component.illustration
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.illustration\.paragraph module
----------------------------------------------------------
+pyams_content.component.illustration.\ ``paragraph``
+----------------------------------------------------
 
 .. automodule:: pyams_content.component.illustration.paragraph
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.illustration.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.illustration.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.illustration.zmi:
 
-pyams_content.component.illustration.zmi package
-================================================
+\ :mod:`pyams_content.component.illustration.zmi` package
+=========================================================
 
 .. automodule:: pyams_content.component.illustration.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.illustration\.zmi\.paragraph module
---------------------------------------------------------------
+pyams_content.component.illustration.zmi.\ ``paragraph``
+--------------------------------------------------------
 
 .. automodule:: pyams_content.component.illustration.zmi.paragraph
     :members:
--- a/src/source/pyams_content/pyams_content.component.links.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.links.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.links.interfaces:
 
-pyams_content.component.links.interfaces package
-================================================
+\ :mod:`pyams_content.component.links.interfaces` package
+=========================================================
 
 .. automodule:: pyams_content.component.links.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.links.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.links.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.links:
 
-pyams_content.component.links package
-=====================================
+\ :mod:`pyams_content.component.links` package
+==============================================
 
 .. automodule:: pyams_content.component.links
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.links.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.links.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.component.links.zmi:
 
-pyams_content.component.links.zmi package
-=========================================
+\ :mod:`pyams_content.component.links.zmi` package
+==================================================
 
 .. automodule:: pyams_content.component.links.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.links\.zmi\.container module
--------------------------------------------------------
+pyams_content.component.links.zmi.\ ``container``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.links.zmi.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.links\.zmi\.reverse module
------------------------------------------------------
+pyams_content.component.links.zmi.\ ``reverse``
+-----------------------------------------------
 
 .. automodule:: pyams_content.component.links.zmi.reverse
     :members:
--- a/src/source/pyams_content/pyams_content.component.media.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.media.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.media:
 
-pyams_content.component.media package
-=====================================
+\ :mod:`pyams_content.component.media` package
+==============================================
 
 .. automodule:: pyams_content.component.media
     :members:
--- a/src/source/pyams_content/pyams_content.component.paragraph.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.paragraph.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,90 +1,87 @@
 .. _pyams_content.component.paragraph.interfaces:
 
-pyams_content.component.paragraph.interfaces package
-====================================================
+\ :mod:`pyams_content.component.paragraph.interfaces` package
+=============================================================
 
 .. automodule:: pyams_content.component.paragraph.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.paragraph\.interfaces\.contact module
-----------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``contact``
+----------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.contact
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.frame module
---------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``frame``
+--------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.frame
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.header module
----------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``header``
+---------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.header
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.html module
--------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``html``
+-------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.html
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.keynumber module
-------------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``keynumber``
+------------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.keynumber
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.keypoint module
------------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``keypoint``
+-----------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.keypoint
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.milestone module
-------------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``milestone``
+------------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.milestone
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.pictogram module
-------------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``pictogram``
+------------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.pictogram
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.verbatim module
------------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``verbatim``
+-----------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.verbatim
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.interfaces\.video module
---------------------------------------------------------------
+pyams_content.component.paragraph.interfaces.\ ``video``
+--------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.interfaces.video
     :members:
--- a/src/source/pyams_content/pyams_content.component.paragraph.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.paragraph.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,98 +1,95 @@
 .. _pyams_content.component.paragraph:
 
-pyams_content.component.paragraph package
-=========================================
+\ :mod:`pyams_content.component.paragraph` package
+==================================================
 
 .. automodule:: pyams_content.component.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.paragraph\.contact module
-----------------------------------------------------
+pyams_content.component.paragraph.\ ``contact``
+-----------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.contact
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.container module
-------------------------------------------------------
+pyams_content.component.paragraph.\ ``container``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.frame module
---------------------------------------------------
+pyams_content.component.paragraph.\ ``frame``
+---------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.frame
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.header module
----------------------------------------------------
+pyams_content.component.paragraph.\ ``header``
+----------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.header
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.html module
--------------------------------------------------
+pyams_content.component.paragraph.\ ``html``
+--------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.html
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.keynumber module
-------------------------------------------------------
+pyams_content.component.paragraph.\ ``keynumber``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.keynumber
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.keypoint module
------------------------------------------------------
+pyams_content.component.paragraph.\ ``keypoint``
+------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.keypoint
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.milestone module
-------------------------------------------------------
+pyams_content.component.paragraph.\ ``milestone``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.milestone
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.pictogram module
-------------------------------------------------------
+pyams_content.component.paragraph.\ ``pictogram``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.pictogram
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.verbatim module
------------------------------------------------------
+pyams_content.component.paragraph.\ ``verbatim``
+------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.verbatim
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.video module
---------------------------------------------------
+pyams_content.component.paragraph.\ ``video``
+---------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.video
     :members:
@@ -101,7 +98,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.paragraph.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.paragraph.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,114 +1,111 @@
 .. _pyams_content.component.paragraph.zmi:
 
-pyams_content.component.paragraph.zmi package
-=============================================
+\ :mod:`pyams_content.component.paragraph.zmi` package
+======================================================
 
 .. automodule:: pyams_content.component.paragraph.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.paragraph\.zmi\.contact module
----------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``contact``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.contact
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.container module
------------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``container``
+-----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.frame module
--------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``frame``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.frame
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.header module
---------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``header``
+--------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.header
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.html module
-------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``html``
+------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.html
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.interfaces module
-------------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``interfaces``
+------------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.keynumber module
------------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``keynumber``
+-----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.keynumber
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.keypoint module
-----------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``keypoint``
+----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.keypoint
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.milestone module
------------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``milestone``
+-----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.milestone
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.pictogram module
------------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``pictogram``
+-----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.pictogram
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.preview module
----------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``preview``
+---------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.preview
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.verbatim module
-----------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``verbatim``
+----------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.verbatim
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.paragraph\.zmi\.video module
--------------------------------------------------------
+pyams_content.component.paragraph.zmi.\ ``video``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.paragraph.zmi.video
     :members:
--- a/src/source/pyams_content/pyams_content.component.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component:
 
-pyams_content.component package
-===============================
+\ :mod:`pyams_content.component` package
+========================================
 
 .. automodule:: pyams_content.component
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.theme.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.theme.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.theme.interfaces:
 
-pyams_content.component.theme.interfaces package
-================================================
+\ :mod:`pyams_content.component.theme.interfaces` package
+=========================================================
 
 .. automodule:: pyams_content.component.theme.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.theme.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.theme.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.theme:
 
-pyams_content.component.theme package
-=====================================
+\ :mod:`pyams_content.component.theme` package
+==============================================
 
 .. automodule:: pyams_content.component.theme
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.theme\.portlet module
-------------------------------------------------
+pyams_content.component.theme.\ ``portlet``
+-------------------------------------------
 
 .. automodule:: pyams_content.component.theme.portlet
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.theme.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.theme.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.component.theme.zmi:
 
-pyams_content.component.theme.zmi package
-=========================================
+\ :mod:`pyams_content.component.theme.zmi` package
+==================================================
 
 .. automodule:: pyams_content.component.theme.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.theme\.zmi\.manager module
------------------------------------------------------
+pyams_content.component.theme.zmi.\ ``manager``
+-----------------------------------------------
 
 .. automodule:: pyams_content.component.theme.zmi.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.theme\.zmi\.portlet module
------------------------------------------------------
+pyams_content.component.theme.zmi.\ ``portlet``
+-----------------------------------------------
 
 .. automodule:: pyams_content.component.theme.zmi.portlet
     :members:
--- a/src/source/pyams_content/pyams_content.component.video.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.video.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.video.interfaces:
 
-pyams_content.component.video.interfaces package
-================================================
+\ :mod:`pyams_content.component.video.interfaces` package
+=========================================================
 
 .. automodule:: pyams_content.component.video.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.component.video.provider.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.video.provider.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_content.component.video.provider:
 
-pyams_content.component.video.provider package
-==============================================
+\ :mod:`pyams_content.component.video.provider` package
+=======================================================
 
 .. automodule:: pyams_content.component.video.provider
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.video\.provider\.dailymotion module
---------------------------------------------------------------
+pyams_content.component.video.provider.\ ``dailymotion``
+--------------------------------------------------------
 
 .. automodule:: pyams_content.component.video.provider.dailymotion
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.video\.provider\.interfaces module
--------------------------------------------------------------
+pyams_content.component.video.provider.\ ``interfaces``
+-------------------------------------------------------
 
 .. automodule:: pyams_content.component.video.provider.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.video\.provider\.vimeo module
---------------------------------------------------------
+pyams_content.component.video.provider.\ ``vimeo``
+--------------------------------------------------
 
 .. automodule:: pyams_content.component.video.provider.vimeo
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.component\.video\.provider\.youtube module
-----------------------------------------------------------
+pyams_content.component.video.provider.\ ``youtube``
+----------------------------------------------------
 
 .. automodule:: pyams_content.component.video.provider.youtube
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.video.provider.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.video.provider.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.component.video.provider.zmi:
 
-pyams_content.component.video.provider.zmi package
-==================================================
+\ :mod:`pyams_content.component.video.provider.zmi` package
+===========================================================
 
 .. automodule:: pyams_content.component.video.provider.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.component.video.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.video.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.video:
 
-pyams_content.component.video package
-=====================================
+\ :mod:`pyams_content.component.video` package
+==============================================
 
 .. automodule:: pyams_content.component.video
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.video\.paragraph module
---------------------------------------------------
+pyams_content.component.video.\ ``paragraph``
+---------------------------------------------
 
 .. automodule:: pyams_content.component.video.paragraph
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.component.video.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.component.video.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.component.video.zmi:
 
-pyams_content.component.video.zmi package
-=========================================
+\ :mod:`pyams_content.component.video.zmi` package
+==================================================
 
 .. automodule:: pyams_content.component.video.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.component\.video\.zmi\.paragraph module
--------------------------------------------------------
+pyams_content.component.video.zmi.\ ``paragraph``
+-------------------------------------------------
 
 .. automodule:: pyams_content.component.video.zmi.paragraph
     :members:
--- a/src/source/pyams_content/pyams_content.features.alert.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.alert.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.features.alert:
 
-pyams_content.features.alert package
-====================================
+\ :mod:`pyams_content.features.alert` package
+=============================================
 
 .. automodule:: pyams_content.features.alert
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.alert\.container module
--------------------------------------------------
+pyams_content.features.alert.\ ``container``
+--------------------------------------------
 
 .. automodule:: pyams_content.features.alert.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.features\.alert\.interfaces module
---------------------------------------------------
+pyams_content.features.alert.\ ``interfaces``
+---------------------------------------------
 
 .. automodule:: pyams_content.features.alert.interfaces
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.features.alert.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.alert.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.alert.zmi:
 
-pyams_content.features.alert.zmi package
-========================================
+\ :mod:`pyams_content.features.alert.zmi` package
+=================================================
 
 .. automodule:: pyams_content.features.alert.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.alert\.zmi\.container module
-------------------------------------------------------
+pyams_content.features.alert.zmi.\ ``container``
+------------------------------------------------
 
 .. automodule:: pyams_content.features.alert.zmi.container
     :members:
--- a/src/source/pyams_content/pyams_content.features.checker.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.checker.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.checker:
 
-pyams_content.features.checker package
-======================================
+\ :mod:`pyams_content.features.checker` package
+===============================================
 
 .. automodule:: pyams_content.features.checker
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.checker\.interfaces module
-----------------------------------------------------
+pyams_content.features.checker.\ ``interfaces``
+-----------------------------------------------
 
 .. automodule:: pyams_content.features.checker.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.features.checker.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.checker.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.features.checker.zmi:
 
-pyams_content.features.checker.zmi package
-==========================================
+\ :mod:`pyams_content.features.checker.zmi` package
+===================================================
 
 .. automodule:: pyams_content.features.checker.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.features.preview.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.preview.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.preview:
 
-pyams_content.features.preview package
-======================================
+\ :mod:`pyams_content.features.preview` package
+===============================================
 
 .. automodule:: pyams_content.features.preview
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.preview\.interfaces module
-----------------------------------------------------
+pyams_content.features.preview.\ ``interfaces``
+-----------------------------------------------
 
 .. automodule:: pyams_content.features.preview.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.features.preview.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.preview.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.preview.zmi:
 
-pyams_content.features.preview.zmi package
-==========================================
+\ :mod:`pyams_content.features.preview.zmi` package
+===================================================
 
 .. automodule:: pyams_content.features.preview.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.preview\.zmi\.interfaces module
----------------------------------------------------------
+pyams_content.features.preview.zmi.\ ``interfaces``
+---------------------------------------------------
 
 .. automodule:: pyams_content.features.preview.zmi.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.features.renderer.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.renderer.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.features.renderer.interfaces:
 
-pyams_content.features.renderer.interfaces package
-==================================================
+\ :mod:`pyams_content.features.renderer.interfaces` package
+===========================================================
 
 .. automodule:: pyams_content.features.renderer.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.features.renderer.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.renderer.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.features.renderer:
 
-pyams_content.features.renderer package
-=======================================
+\ :mod:`pyams_content.features.renderer` package
+================================================
 
 .. automodule:: pyams_content.features.renderer
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.features.renderer.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.renderer.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.renderer.zmi:
 
-pyams_content.features.renderer.zmi package
-===========================================
+\ :mod:`pyams_content.features.renderer.zmi` package
+====================================================
 
 .. automodule:: pyams_content.features.renderer.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.renderer\.zmi\.widget module
-------------------------------------------------------
+pyams_content.features.renderer.zmi.\ ``widget``
+------------------------------------------------
 
 .. automodule:: pyams_content.features.renderer.zmi.widget
     :members:
--- a/src/source/pyams_content/pyams_content.features.review.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.review.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.features.review:
 
-pyams_content.features.review package
-=====================================
+\ :mod:`pyams_content.features.review` package
+==============================================
 
 .. automodule:: pyams_content.features.review
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.features\.review\.interfaces module
----------------------------------------------------
+pyams_content.features.review.\ ``interfaces``
+----------------------------------------------
 
 .. automodule:: pyams_content.features.review.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.features.review.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.review.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.features.review.zmi:
 
-pyams_content.features.review.zmi package
-=========================================
+\ :mod:`pyams_content.features.review.zmi` package
+==================================================
 
 .. automodule:: pyams_content.features.review.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.features.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.features.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.features:
 
-pyams_content.features package
-==============================
+\ :mod:`pyams_content.features` package
+=======================================
 
 .. automodule:: pyams_content.features
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.generations.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.generations.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.generations:
 
-pyams_content.generations package
-=================================
+\ :mod:`pyams_content.generations` package
+==========================================
 
 .. automodule:: pyams_content.generations
     :members:
--- a/src/source/pyams_content/pyams_content.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.interfaces:
 
-pyams_content.interfaces package
-================================
+\ :mod:`pyams_content.interfaces` package
+=========================================
 
 .. automodule:: pyams_content.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.interfaces\.container module
---------------------------------------------
+pyams_content.interfaces.\ ``container``
+----------------------------------------
 
 .. automodule:: pyams_content.interfaces.container
     :members:
--- a/src/source/pyams_content/pyams_content.profile.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.profile.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.profile.interfaces:
 
-pyams_content.profile.interfaces package
-========================================
+\ :mod:`pyams_content.profile.interfaces` package
+=================================================
 
 .. automodule:: pyams_content.profile.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.profile.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.profile.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.profile:
 
-pyams_content.profile package
-=============================
+\ :mod:`pyams_content.profile` package
+======================================
 
 .. automodule:: pyams_content.profile
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.profile\.admin module
--------------------------------------
+pyams_content.profile.\ ``admin``
+---------------------------------
 
 .. automodule:: pyams_content.profile.admin
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.profile.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.profile.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.profile.zmi:
 
-pyams_content.profile.zmi package
-=================================
+\ :mod:`pyams_content.profile.zmi` package
+==========================================
 
 .. automodule:: pyams_content.profile.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.reference.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.reference.interfaces:
 
-pyams_content.reference.interfaces package
-==========================================
+\ :mod:`pyams_content.reference.interfaces` package
+===================================================
 
 .. automodule:: pyams_content.reference.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.reference.pictograms.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.pictograms.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.reference.pictograms.interfaces:
 
-pyams_content.reference.pictograms.interfaces package
-=====================================================
+\ :mod:`pyams_content.reference.pictograms.interfaces` package
+==============================================================
 
 .. automodule:: pyams_content.reference.pictograms.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.reference.pictograms.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.pictograms.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.reference.pictograms:
 
-pyams_content.reference.pictograms package
-==========================================
+\ :mod:`pyams_content.reference.pictograms` package
+===================================================
 
 .. automodule:: pyams_content.reference.pictograms
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.reference\.pictograms\.manager module
------------------------------------------------------
+pyams_content.reference.pictograms.\ ``manager``
+------------------------------------------------
 
 .. automodule:: pyams_content.reference.pictograms.manager
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.reference.pictograms.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.pictograms.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.reference.pictograms.zmi:
 
-pyams_content.reference.pictograms.zmi package
-==============================================
+\ :mod:`pyams_content.reference.pictograms.zmi` package
+=======================================================
 
 .. automodule:: pyams_content.reference.pictograms.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.reference\.pictograms\.zmi\.manager module
-----------------------------------------------------------
+pyams_content.reference.pictograms.zmi.\ ``manager``
+----------------------------------------------------
 
 .. automodule:: pyams_content.reference.pictograms.zmi.manager
     :members:
--- a/src/source/pyams_content/pyams_content.reference.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.reference:
 
-pyams_content.reference package
-===============================
+\ :mod:`pyams_content.reference` package
+========================================
 
 .. automodule:: pyams_content.reference
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.reference.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.reference.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.reference.zmi:
 
-pyams_content.reference.zmi package
-===================================
+\ :mod:`pyams_content.reference.zmi` package
+============================================
 
 .. automodule:: pyams_content.reference.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.reference\.zmi\.table module
---------------------------------------------
+pyams_content.reference.zmi.\ ``table``
+---------------------------------------
 
 .. automodule:: pyams_content.reference.zmi.table
     :members:
--- a/src/source/pyams_content/pyams_content.root.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.root.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.root.interfaces:
 
-pyams_content.root.interfaces package
-=====================================
+\ :mod:`pyams_content.root.interfaces` package
+==============================================
 
 .. automodule:: pyams_content.root.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.root.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.root.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.root:
 
-pyams_content.root package
-==========================
+\ :mod:`pyams_content.root` package
+===================================
 
 .. automodule:: pyams_content.root
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.root.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.root.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.root.zmi:
 
-pyams_content.root.zmi package
-==============================
+\ :mod:`pyams_content.root.zmi` package
+=======================================
 
 .. automodule:: pyams_content.root.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.root\.zmi\.search module
-----------------------------------------
+pyams_content.root.zmi.\ ``search``
+-----------------------------------
 
 .. automodule:: pyams_content.root.zmi.search
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.root\.zmi\.sites module
----------------------------------------
+pyams_content.root.zmi.\ ``sites``
+----------------------------------
 
 .. automodule:: pyams_content.root.zmi.sites
     :members:
--- a/src/source/pyams_content/pyams_content.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content:
 
-pyams_content package
-=====================
+\ :mod:`pyams_content` package
+==============================
 
 .. automodule:: pyams_content
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.include module
-------------------------------
+pyams_content.\ ``include``
+---------------------------
 
 .. automodule:: pyams_content.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.site module
----------------------------
+pyams_content.\ ``site``
+------------------------
 
 .. automodule:: pyams_content.site
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.scripts.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.scripts.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.scripts:
 
-pyams_content.scripts package
-=============================
+\ :mod:`pyams_content.scripts` package
+======================================
 
 .. automodule:: pyams_content.scripts
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.scripts\.index module
--------------------------------------
+pyams_content.scripts.\ ``index``
+---------------------------------
 
 .. automodule:: pyams_content.scripts.index
     :members:
--- a/src/source/pyams_content/pyams_content.shared.blog.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.blog.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.blog.interfaces:
 
-pyams_content.shared.blog.interfaces package
-============================================
+\ :mod:`pyams_content.shared.blog.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.blog.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.blog.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.blog.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.shared.blog:
 
-pyams_content.shared.blog package
-=================================
+\ :mod:`pyams_content.shared.blog` package
+==========================================
 
 .. automodule:: pyams_content.shared.blog
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.blog\.manager module
---------------------------------------------
+pyams_content.shared.blog.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.blog.manager
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.blog.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.blog.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.shared.blog.zmi:
 
-pyams_content.shared.blog.zmi package
-=====================================
+\ :mod:`pyams_content.shared.blog.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.blog.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.blog\.zmi\.manager module
--------------------------------------------------
+pyams_content.shared.blog.zmi.\ ``manager``
+-------------------------------------------
 
 .. automodule:: pyams_content.shared.blog.zmi.manager
     :members:
--- a/src/source/pyams_content/pyams_content.shared.common.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.common.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.shared.common.interfaces:
 
-pyams_content.shared.common.interfaces package
-==============================================
+\ :mod:`pyams_content.shared.common.interfaces` package
+=======================================================
 
 .. automodule:: pyams_content.shared.common.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.common\.interfaces\.types module
---------------------------------------------------------
+pyams_content.shared.common.interfaces.\ ``types``
+--------------------------------------------------
 
 .. automodule:: pyams_content.shared.common.interfaces.types
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.interfaces\.zmi module
-------------------------------------------------------
+pyams_content.shared.common.interfaces.\ ``zmi``
+------------------------------------------------
 
 .. automodule:: pyams_content.shared.common.interfaces.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.shared.common.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.common.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.shared.common:
 
-pyams_content.shared.common package
-===================================
+\ :mod:`pyams_content.shared.common` package
+============================================
 
 .. automodule:: pyams_content.shared.common
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.common\.manager module
-----------------------------------------------
+pyams_content.shared.common.\ ``manager``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.common.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.security module
------------------------------------------------
+pyams_content.shared.common.\ ``security``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.common.security
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.types module
---------------------------------------------
+pyams_content.shared.common.\ ``types``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.common.types
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.common.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.common.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,106 +1,103 @@
 .. _pyams_content.shared.common.zmi:
 
-pyams_content.shared.common.zmi package
-=======================================
+\ :mod:`pyams_content.shared.common.zmi` package
+================================================
 
 .. automodule:: pyams_content.shared.common.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.common\.zmi\.dashboard module
------------------------------------------------------
+pyams_content.shared.common.zmi.\ ``dashboard``
+-----------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.dashboard
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.header module
---------------------------------------------------
+pyams_content.shared.common.zmi.\ ``header``
+--------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.header
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.i18n module
-------------------------------------------------
+pyams_content.shared.common.zmi.\ ``i18n``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.i18n
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.manager module
----------------------------------------------------
+pyams_content.shared.common.zmi.\ ``manager``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.owner module
--------------------------------------------------
+pyams_content.shared.common.zmi.\ ``owner``
+-------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.owner
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.properties module
-------------------------------------------------------
+pyams_content.shared.common.zmi.\ ``properties``
+------------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.properties
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.search module
---------------------------------------------------
+pyams_content.shared.common.zmi.\ ``search``
+--------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.search
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.security module
-----------------------------------------------------
+pyams_content.shared.common.zmi.\ ``security``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.security
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.site module
-------------------------------------------------
+pyams_content.shared.common.zmi.\ ``site``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.summary module
----------------------------------------------------
+pyams_content.shared.common.zmi.\ ``summary``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.summary
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.types module
--------------------------------------------------
+pyams_content.shared.common.zmi.\ ``types``
+-------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.types
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.common\.zmi\.workflow module
-----------------------------------------------------
+pyams_content.shared.common.zmi.\ ``workflow``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.common.zmi.workflow
     :members:
--- a/src/source/pyams_content/pyams_content.shared.form.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.form.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.form.interfaces:
 
-pyams_content.shared.form.interfaces package
-============================================
+\ :mod:`pyams_content.shared.form.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.form.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.form.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.form.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.shared.form:
 
-pyams_content.shared.form package
-=================================
+\ :mod:`pyams_content.shared.form` package
+==========================================
 
 .. automodule:: pyams_content.shared.form
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.form\.field module
-------------------------------------------
+pyams_content.shared.form.\ ``field``
+-------------------------------------
 
 .. automodule:: pyams_content.shared.form.field
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.form\.handler module
---------------------------------------------
+pyams_content.shared.form.\ ``handler``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.form.handler
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.form\.manager module
---------------------------------------------
+pyams_content.shared.form.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.form.manager
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.form.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.form.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.shared.form.zmi:
 
-pyams_content.shared.form.zmi package
-=====================================
+\ :mod:`pyams_content.shared.form.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.form.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.form\.zmi\.field module
------------------------------------------------
+pyams_content.shared.form.zmi.\ ``field``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.form.zmi.field
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.form\.zmi\.properties module
-----------------------------------------------------
+pyams_content.shared.form.zmi.\ ``properties``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.form.zmi.properties
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.form\.zmi\.render module
-------------------------------------------------
+pyams_content.shared.form.zmi.\ ``render``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.form.zmi.render
     :members:
--- a/src/source/pyams_content/pyams_content.shared.imagemap.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.imagemap.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.imagemap.interfaces:
 
-pyams_content.shared.imagemap.interfaces package
-================================================
+\ :mod:`pyams_content.shared.imagemap.interfaces` package
+=========================================================
 
 .. automodule:: pyams_content.shared.imagemap.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.imagemap.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.imagemap.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.shared.imagemap:
 
-pyams_content.shared.imagemap package
-=====================================
+\ :mod:`pyams_content.shared.imagemap` package
+==============================================
 
 .. automodule:: pyams_content.shared.imagemap
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.imagemap\.manager module
-------------------------------------------------
+pyams_content.shared.imagemap.\ ``manager``
+-------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.paragraph module
---------------------------------------------------
+pyams_content.shared.imagemap.\ ``paragraph``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.schema module
------------------------------------------------
+pyams_content.shared.imagemap.\ ``schema``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.schema
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.imagemap.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.imagemap.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_content.shared.imagemap.zmi:
 
-pyams_content.shared.imagemap.zmi package
-=========================================
+\ :mod:`pyams_content.shared.imagemap.zmi` package
+==================================================
 
 .. automodule:: pyams_content.shared.imagemap.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.imagemap\.zmi\.area module
---------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``area``
+--------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.area
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.zmi\.container module
--------------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``container``
+-------------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.zmi\.paragraph module
--------------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``paragraph``
+-------------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.zmi\.properties module
---------------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``properties``
+--------------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.properties
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.zmi\.render module
-----------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``render``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.render
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.imagemap\.zmi\.widget module
-----------------------------------------------------
+pyams_content.shared.imagemap.zmi.\ ``widget``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.imagemap.zmi.widget
     :members:
--- a/src/source/pyams_content/pyams_content.shared.logo.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.logo.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.logo.interfaces:
 
-pyams_content.shared.logo.interfaces package
-============================================
+\ :mod:`pyams_content.shared.logo.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.logo.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.logo.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.logo.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.shared.logo:
 
-pyams_content.shared.logo package
-=================================
+\ :mod:`pyams_content.shared.logo` package
+==========================================
 
 .. automodule:: pyams_content.shared.logo
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.logo\.manager module
---------------------------------------------
+pyams_content.shared.logo.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.logo.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.logo\.paragraph module
-----------------------------------------------
+pyams_content.shared.logo.\ ``paragraph``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.logo.paragraph
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.logo.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.logo.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.shared.logo.zmi:
 
-pyams_content.shared.logo.zmi package
-=====================================
+\ :mod:`pyams_content.shared.logo.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.logo.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.logo\.zmi\.paragraph module
----------------------------------------------------
+pyams_content.shared.logo.zmi.\ ``paragraph``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.logo.zmi.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.logo\.zmi\.properties module
-----------------------------------------------------
+pyams_content.shared.logo.zmi.\ ``properties``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.logo.zmi.properties
     :members:
--- a/src/source/pyams_content/pyams_content.shared.news.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.news.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.news.interfaces:
 
-pyams_content.shared.news.interfaces package
-============================================
+\ :mod:`pyams_content.shared.news.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.news.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.news.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.news.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.shared.news:
 
-pyams_content.shared.news package
-=================================
+\ :mod:`pyams_content.shared.news` package
+==========================================
 
 .. automodule:: pyams_content.shared.news
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.news\.manager module
---------------------------------------------
+pyams_content.shared.news.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.news.manager
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.news.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.news.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.news.zmi:
 
-pyams_content.shared.news.zmi package
-=====================================
+\ :mod:`pyams_content.shared.news.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.news.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.shared.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared:
 
-pyams_content.shared package
-============================
+\ :mod:`pyams_content.shared` package
+=====================================
 
 .. automodule:: pyams_content.shared
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.site.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.site.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.site.interfaces:
 
-pyams_content.shared.site.interfaces package
-============================================
+\ :mod:`pyams_content.shared.site.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.site.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.site.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.site.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_content.shared.site:
 
-pyams_content.shared.site package
-=================================
+\ :mod:`pyams_content.shared.site` package
+==========================================
 
 .. automodule:: pyams_content.shared.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.site\.container module
-----------------------------------------------
+pyams_content.shared.site.\ ``container``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.site.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.folder module
--------------------------------------------
+pyams_content.shared.site.\ ``folder``
+--------------------------------------
 
 .. automodule:: pyams_content.shared.site.folder
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.link module
------------------------------------------
+pyams_content.shared.site.\ ``link``
+------------------------------------
 
 .. automodule:: pyams_content.shared.site.link
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.manager module
---------------------------------------------
+pyams_content.shared.site.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.site.manager
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.site.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.site.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_content.shared.site.zmi:
 
-pyams_content.shared.site.zmi package
-=====================================
+\ :mod:`pyams_content.shared.site.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.site.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.site\.zmi\.container module
----------------------------------------------------
+pyams_content.shared.site.zmi.\ ``container``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.site.zmi.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.zmi\.folder module
-------------------------------------------------
+pyams_content.shared.site.zmi.\ ``folder``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.site.zmi.folder
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.zmi\.link module
-----------------------------------------------
+pyams_content.shared.site.zmi.\ ``link``
+----------------------------------------
 
 .. automodule:: pyams_content.shared.site.zmi.link
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.site\.zmi\.manager module
--------------------------------------------------
+pyams_content.shared.site.zmi.\ ``manager``
+-------------------------------------------
 
 .. automodule:: pyams_content.shared.site.zmi.manager
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.site.zmi.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.site.zmi.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.shared.site.zmi.widget:
 
-pyams_content.shared.site.zmi.widget package
-============================================
+\ :mod:`pyams_content.shared.site.zmi.widget` package
+=====================================================
 
 .. automodule:: pyams_content.shared.site.zmi.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.site\.zmi\.widget\.interfaces module
-------------------------------------------------------------
+pyams_content.shared.site.zmi.widget.\ ``interfaces``
+-----------------------------------------------------
 
 .. automodule:: pyams_content.shared.site.zmi.widget.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.view.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.view.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.view.interfaces:
 
-pyams_content.shared.view.interfaces package
-============================================
+\ :mod:`pyams_content.shared.view.interfaces` package
+=====================================================
 
 .. automodule:: pyams_content.shared.view.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.shared.view.portlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.view.portlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.shared.view.portlet:
 
-pyams_content.shared.view.portlet package
-=========================================
+\ :mod:`pyams_content.shared.view.portlet` package
+==================================================
 
 .. automodule:: pyams_content.shared.view.portlet
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.view\.portlet\.interfaces module
---------------------------------------------------------
+pyams_content.shared.view.portlet.\ ``interfaces``
+--------------------------------------------------
 
 .. automodule:: pyams_content.shared.view.portlet.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.view.portlet.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.view.portlet.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.shared.view.portlet.zmi:
 
-pyams_content.shared.view.portlet.zmi package
-=============================================
+\ :mod:`pyams_content.shared.view.portlet.zmi` package
+======================================================
 
 .. automodule:: pyams_content.shared.view.portlet.zmi
     :members:
--- a/src/source/pyams_content/pyams_content.shared.view.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.view.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_content.shared.view:
 
-pyams_content.shared.view package
-=================================
+\ :mod:`pyams_content.shared.view` package
+==========================================
 
 .. automodule:: pyams_content.shared.view
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.view\.manager module
---------------------------------------------
+pyams_content.shared.view.\ ``manager``
+---------------------------------------
 
 .. automodule:: pyams_content.shared.view.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.view\.reference module
-----------------------------------------------
+pyams_content.shared.view.\ ``reference``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.view.reference
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.view\.theme module
-------------------------------------------
+pyams_content.shared.view.\ ``theme``
+-------------------------------------
 
 .. automodule:: pyams_content.shared.view.theme
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.shared.view.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.shared.view.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_content.shared.view.zmi:
 
-pyams_content.shared.view.zmi package
-=====================================
+\ :mod:`pyams_content.shared.view.zmi` package
+==============================================
 
 .. automodule:: pyams_content.shared.view.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.shared\.view\.zmi\.properties module
-----------------------------------------------------
+pyams_content.shared.view.zmi.\ ``properties``
+----------------------------------------------
 
 .. automodule:: pyams_content.shared.view.zmi.properties
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.view\.zmi\.reference module
----------------------------------------------------
+pyams_content.shared.view.zmi.\ ``reference``
+---------------------------------------------
 
 .. automodule:: pyams_content.shared.view.zmi.reference
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.view\.zmi\.render module
-------------------------------------------------
+pyams_content.shared.view.zmi.\ ``render``
+------------------------------------------
 
 .. automodule:: pyams_content.shared.view.zmi.render
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.shared\.view\.zmi\.theme module
------------------------------------------------
+pyams_content.shared.view.zmi.\ ``theme``
+-----------------------------------------
 
 .. automodule:: pyams_content.shared.view.zmi.theme
     :members:
--- a/src/source/pyams_content/pyams_content.skin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.skin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.skin:
 
-pyams_content.skin package
-==========================
+\ :mod:`pyams_content.skin` package
+===================================
 
 .. automodule:: pyams_content.skin
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.skin\.routes module
------------------------------------
+pyams_content.skin.\ ``routes``
+-------------------------------
 
 .. automodule:: pyams_content.skin.routes
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.skin.zmi.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.skin.zmi.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.skin.zmi.interfaces:
 
-pyams_content.skin.zmi.interfaces package
-=========================================
+\ :mod:`pyams_content.skin.zmi.interfaces` package
+==================================================
 
 .. automodule:: pyams_content.skin.zmi.interfaces
     :members:
--- a/src/source/pyams_content/pyams_content.skin.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.skin.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.skin.zmi:
 
-pyams_content.skin.zmi package
-==============================
+\ :mod:`pyams_content.skin.zmi` package
+=======================================
 
 .. automodule:: pyams_content.skin.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.skin\.zmi\.tinymce module
------------------------------------------
+pyams_content.skin.zmi.\ ``tinymce``
+------------------------------------
 
 .. automodule:: pyams_content.skin.zmi.tinymce
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.skin.zmi.viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.skin.zmi.viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.skin.zmi.viewlet:
 
-pyams_content.skin.zmi.viewlet package
-======================================
+\ :mod:`pyams_content.skin.zmi.viewlet` package
+===============================================
 
 .. automodule:: pyams_content.skin.zmi.viewlet
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.skin.zmi.viewlet.toplinks.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.skin.zmi.viewlet.toplinks.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content.skin.zmi.viewlet.toplinks:
 
-pyams_content.skin.zmi.viewlet.toplinks package
-===============================================
+\ :mod:`pyams_content.skin.zmi.viewlet.toplinks` package
+========================================================
 
 .. automodule:: pyams_content.skin.zmi.viewlet.toplinks
     :members:
--- a/src/source/pyams_content/pyams_content.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content.tests:
 
-pyams_content.tests package
-===========================
+\ :mod:`pyams_content.tests` package
+====================================
 
 .. automodule:: pyams_content.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.tests\.test\_utilsdocs module
----------------------------------------------
+pyams_content.tests.\ ``test_utilsdocs``
+----------------------------------------
 
 .. automodule:: pyams_content.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.tests\.test\_utilsdocstrings module
----------------------------------------------------
+pyams_content.tests.\ ``test_utilsdocstrings``
+----------------------------------------------
 
 .. automodule:: pyams_content.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_content/pyams_content.workflow.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.workflow.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_content.workflow:
 
-pyams_content.workflow package
-==============================
+\ :mod:`pyams_content.workflow` package
+=======================================
 
 .. automodule:: pyams_content.workflow
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.workflow\.basic module
---------------------------------------
+pyams_content.workflow.\ ``basic``
+----------------------------------
 
 .. automodule:: pyams_content.workflow.basic
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.workflow\.interfaces module
--------------------------------------------
+pyams_content.workflow.\ ``interfaces``
+---------------------------------------
 
 .. automodule:: pyams_content.workflow.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.workflow\.notify module
----------------------------------------
+pyams_content.workflow.\ ``notify``
+-----------------------------------
 
 .. automodule:: pyams_content.workflow.notify
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\.workflow\.task module
--------------------------------------
+pyams_content.workflow.\ ``task``
+---------------------------------
 
 .. automodule:: pyams_content.workflow.task
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content/pyams_content.workflow.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content/pyams_content.workflow.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content.workflow.zmi:
 
-pyams_content.workflow.zmi package
-==================================
+\ :mod:`pyams_content.workflow.zmi` package
+===========================================
 
 .. automodule:: pyams_content.workflow.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\.workflow\.zmi\.task module
-------------------------------------------
+pyams_content.workflow.zmi.\ ``task``
+-------------------------------------
 
 .. automodule:: pyams_content.workflow.zmi.task
     :members:
--- a/src/source/pyams_content_es/pyams_content_es.component.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.component.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_content_es.component:
 
-pyams_content_es.component package
-==================================
+\ :mod:`pyams_content_es.component` package
+===========================================
 
 .. automodule:: pyams_content_es.component
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\_es\.component\.extfile module
----------------------------------------------
+pyams_content_es.component.\ ``extfile``
+----------------------------------------
 
 .. automodule:: pyams_content_es.component.extfile
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.component\.gallery module
----------------------------------------------
+pyams_content_es.component.\ ``gallery``
+----------------------------------------
 
 .. automodule:: pyams_content_es.component.gallery
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.component\.paragraph module
------------------------------------------------
+pyams_content_es.component.\ ``paragraph``
+------------------------------------------
 
 .. automodule:: pyams_content_es.component.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.component\.theme module
--------------------------------------------
+pyams_content_es.component.\ ``theme``
+--------------------------------------
 
 .. automodule:: pyams_content_es.component.theme
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.component\.view module
-------------------------------------------
+pyams_content_es.component.\ ``view``
+-------------------------------------
 
 .. automodule:: pyams_content_es.component.view
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.component\.workflow module
-----------------------------------------------
+pyams_content_es.component.\ ``workflow``
+-----------------------------------------
 
 .. automodule:: pyams_content_es.component.workflow
     :members:
--- a/src/source/pyams_content_es/pyams_content_es.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_content_es.interfaces:
 
-pyams_content_es.interfaces package
-===================================
+\ :mod:`pyams_content_es.interfaces` package
+============================================
 
 .. automodule:: pyams_content_es.interfaces
     :members:
--- a/src/source/pyams_content_es/pyams_content_es.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_content_es:
 
-pyams_content_es package
-========================
+\ :mod:`pyams_content_es` package
+=================================
 
 .. automodule:: pyams_content_es
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\_es\.document module
------------------------------------
+pyams_content_es.\ ``document``
+-------------------------------
 
 .. automodule:: pyams_content_es.document
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.include module
-----------------------------------
+pyams_content_es.\ ``include``
+------------------------------
 
 .. automodule:: pyams_content_es.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.index module
---------------------------------
+pyams_content_es.\ ``index``
+----------------------------
 
 .. automodule:: pyams_content_es.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.process module
-----------------------------------
+pyams_content_es.\ ``process``
+------------------------------
 
 .. automodule:: pyams_content_es.process
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.site module
--------------------------------
+pyams_content_es.\ ``site``
+---------------------------
 
 .. automodule:: pyams_content_es.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.utility module
-----------------------------------
+pyams_content_es.\ ``utility``
+------------------------------
 
 .. automodule:: pyams_content_es.utility
     :members:
@@ -61,7 +58,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_content_es/pyams_content_es.scripts.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.scripts.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content_es.scripts:
 
-pyams_content_es.scripts package
-================================
+\ :mod:`pyams_content_es.scripts` package
+=========================================
 
 .. automodule:: pyams_content_es.scripts
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\_es\.scripts\.index module
------------------------------------------
+pyams_content_es.scripts.\ ``index``
+------------------------------------
 
 .. automodule:: pyams_content_es.scripts.index
     :members:
--- a/src/source/pyams_content_es/pyams_content_es.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_content_es.tests:
 
-pyams_content_es.tests package
-==============================
+\ :mod:`pyams_content_es.tests` package
+=======================================
 
 .. automodule:: pyams_content_es.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\_es\.tests\.test\_utilsdocs module
--------------------------------------------------
+pyams_content_es.tests.\ ``test_utilsdocs``
+-------------------------------------------
 
 .. automodule:: pyams_content_es.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_content\_es\.tests\.test\_utilsdocstrings module
--------------------------------------------------------
+pyams_content_es.tests.\ ``test_utilsdocstrings``
+-------------------------------------------------
 
 .. automodule:: pyams_content_es.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_content_es/pyams_content_es.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_content_es/pyams_content_es.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_content_es.zmi:
 
-pyams_content_es.zmi package
-============================
+\ :mod:`pyams_content_es.zmi` package
+=====================================
 
 .. automodule:: pyams_content_es.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_content\_es\.zmi\.test module
-------------------------------------
+pyams_content_es.zmi.\ ``test``
+-------------------------------
 
 .. automodule:: pyams_content_es.zmi.test
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.component.association.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.association.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.component.association:
 
-pyams_default_theme.component.association package
-=================================================
+\ :mod:`pyams_default_theme.component.association` package
+==========================================================
 
 .. automodule:: pyams_default_theme.component.association
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.component.gallery.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.gallery.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.component.gallery:
 
-pyams_default_theme.component.gallery package
-=============================================
+\ :mod:`pyams_default_theme.component.gallery` package
+======================================================
 
 .. automodule:: pyams_default_theme.component.gallery
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.component.illustration.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.illustration.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.component.illustration.interfaces:
 
-pyams_default_theme.component.illustration.interfaces package
-=============================================================
+\ :mod:`pyams_default_theme.component.illustration.interfaces` package
+======================================================================
 
 .. automodule:: pyams_default_theme.component.illustration.interfaces
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.component.illustration.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.illustration.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.component.illustration:
 
-pyams_default_theme.component.illustration package
-==================================================
+\ :mod:`pyams_default_theme.component.illustration` package
+===========================================================
 
 .. automodule:: pyams_default_theme.component.illustration
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_default_theme/pyams_default_theme.component.paragraph.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.paragraph.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_default_theme.component.paragraph.interfaces:
 
-pyams_default_theme.component.paragraph.interfaces package
-==========================================================
+\ :mod:`pyams_default_theme.component.paragraph.interfaces` package
+===================================================================
 
 .. automodule:: pyams_default_theme.component.paragraph.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_default\_theme\.component\.paragraph\.interfaces\.contact module
------------------------------------------------------------------------
+pyams_default_theme.component.paragraph.interfaces.\ ``contact``
+----------------------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.interfaces.contact
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.interfaces\.frame module
----------------------------------------------------------------------
+pyams_default_theme.component.paragraph.interfaces.\ ``frame``
+--------------------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.interfaces.frame
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.interfaces\.verbatim module
-------------------------------------------------------------------------
+pyams_default_theme.component.paragraph.interfaces.\ ``verbatim``
+-----------------------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.interfaces.verbatim
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.component.paragraph.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.paragraph.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_default_theme.component.paragraph:
 
-pyams_default_theme.component.paragraph package
-===============================================
+\ :mod:`pyams_default_theme.component.paragraph` package
+========================================================
 
 .. automodule:: pyams_default_theme.component.paragraph
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_default\_theme\.component\.paragraph\.contact module
------------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``contact``
+-----------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.contact
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.frame module
----------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``frame``
+---------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.frame
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.header module
-----------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``header``
+----------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.header
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.keypoint module
-------------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``keypoint``
+------------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.keypoint
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.verbatim module
-------------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``verbatim``
+------------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.verbatim
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.component\.paragraph\.video module
----------------------------------------------------------
+pyams_default_theme.component.paragraph.\ ``video``
+---------------------------------------------------
 
 .. automodule:: pyams_default_theme.component.paragraph.video
     :members:
@@ -61,7 +58,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_default_theme/pyams_default_theme.component.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.component.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.component:
 
-pyams_default_theme.component package
-=====================================
+\ :mod:`pyams_default_theme.component` package
+==============================================
 
 .. automodule:: pyams_default_theme.component
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_default_theme/pyams_default_theme.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_default_theme:
 
-pyams_default_theme package
-===========================
+\ :mod:`pyams_default_theme` package
+====================================
 
 .. automodule:: pyams_default_theme
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_default\_theme\.include module
--------------------------------------
+pyams_default_theme.\ ``include``
+---------------------------------
 
 .. automodule:: pyams_default_theme.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.layer module
------------------------------------
+pyams_default_theme.\ ``layer``
+-------------------------------
 
 .. automodule:: pyams_default_theme.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.page module
-----------------------------------
+pyams_default_theme.\ ``page``
+------------------------------
 
 .. automodule:: pyams_default_theme.page
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.skin module
-----------------------------------
+pyams_default_theme.\ ``skin``
+------------------------------
 
 .. automodule:: pyams_default_theme.skin
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_default_theme/pyams_default_theme.shared.logo.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.shared.logo.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_default_theme.shared.logo:
 
-pyams_default_theme.shared.logo package
-=======================================
+\ :mod:`pyams_default_theme.shared.logo` package
+================================================
 
 .. automodule:: pyams_default_theme.shared.logo
     :members:
--- a/src/source/pyams_default_theme/pyams_default_theme.shared.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.shared.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_default_theme.shared:
 
-pyams_default_theme.shared package
-==================================
+\ :mod:`pyams_default_theme.shared` package
+===========================================
 
 .. automodule:: pyams_default_theme.shared
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_default\_theme\.shared\.common module
---------------------------------------------
+pyams_default_theme.shared.\ ``common``
+---------------------------------------
 
 .. automodule:: pyams_default_theme.shared.common
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_default_theme/pyams_default_theme.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_default_theme/pyams_default_theme.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_default_theme.tests:
 
-pyams_default_theme.tests package
-=================================
+\ :mod:`pyams_default_theme.tests` package
+==========================================
 
 .. automodule:: pyams_default_theme.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_default\_theme\.tests\.test\_utilsdocs module
-----------------------------------------------------
+pyams_default_theme.tests.\ ``test_utilsdocs``
+----------------------------------------------
 
 .. automodule:: pyams_default_theme.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_default\_theme\.tests\.test\_utilsdocstrings module
-----------------------------------------------------------
+pyams_default_theme.tests.\ ``test_utilsdocstrings``
+----------------------------------------------------
 
 .. automodule:: pyams_default_theme.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_file/pyams_file.archive.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.archive.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_file.archive:
 
-pyams_file.archive package
-==========================
+\ :mod:`pyams_file.archive` package
+===================================
 
 .. automodule:: pyams_file.archive
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.archive\.bz2 module
---------------------------------
+pyams_file.archive.\ ``bz2``
+----------------------------
 
 .. automodule:: pyams_file.archive.bz2
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.archive\.gz module
--------------------------------
+pyams_file.archive.\ ``gz``
+---------------------------
 
 .. automodule:: pyams_file.archive.gz
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.archive\.tar module
---------------------------------
+pyams_file.archive.\ ``tar``
+----------------------------
 
 .. automodule:: pyams_file.archive.tar
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.archive\.zip module
---------------------------------
+pyams_file.archive.\ ``zip``
+----------------------------
 
 .. automodule:: pyams_file.archive.zip
     :members:
--- a/src/source/pyams_file/pyams_file.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_file.interfaces:
 
-pyams_file.interfaces package
-=============================
+\ :mod:`pyams_file.interfaces` package
+======================================
 
 .. automodule:: pyams_file.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.interfaces\.archive module
----------------------------------------
+pyams_file.interfaces.\ ``archive``
+-----------------------------------
 
 .. automodule:: pyams_file.interfaces.archive
     :members:
--- a/src/source/pyams_file/pyams_file.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,66 +1,63 @@
 .. _pyams_file:
 
-pyams_file package
-==================
+\ :mod:`pyams_file` package
+===========================
 
 .. automodule:: pyams_file
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.file module
-------------------------
+pyams_file.\ ``file``
+---------------------
 
 .. automodule:: pyams_file.file
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.image module
--------------------------
+pyams_file.\ ``image``
+----------------------
 
 .. automodule:: pyams_file.image
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.include module
----------------------------
+pyams_file.\ ``include``
+------------------------
 
 .. automodule:: pyams_file.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.property module
-----------------------------
+pyams_file.\ ``property``
+-------------------------
 
 .. automodule:: pyams_file.property
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.schema module
---------------------------
+pyams_file.\ ``schema``
+-----------------------
 
 .. automodule:: pyams_file.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.thumbnail module
------------------------------
+pyams_file.\ ``thumbnail``
+--------------------------
 
 .. automodule:: pyams_file.thumbnail
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.watermark module
------------------------------
+pyams_file.\ ``watermark``
+--------------------------
 
 .. automodule:: pyams_file.watermark
     :members:
@@ -69,7 +66,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_file/pyams_file.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_file.tests:
 
-pyams_file.tests package
-========================
+\ :mod:`pyams_file.tests` package
+=================================
 
 .. automodule:: pyams_file.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.tests\.test\_utilsdocs module
-------------------------------------------
+pyams_file.tests.\ ``test_utilsdocs``
+-------------------------------------
 
 .. automodule:: pyams_file.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.tests\.test\_utilsdocstrings module
-------------------------------------------------
+pyams_file.tests.\ ``test_utilsdocstrings``
+-------------------------------------------
 
 .. automodule:: pyams_file.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_file/pyams_file.views.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.views.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_file.views:
 
-pyams_file.views package
-========================
+\ :mod:`pyams_file.views` package
+=================================
 
 .. automodule:: pyams_file.views
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.views\.file module
--------------------------------
+pyams_file.views.\ ``file``
+---------------------------
 
 .. automodule:: pyams_file.views.file
     :members:
--- a/src/source/pyams_file/pyams_file.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_file.widget:
 
-pyams_file.widget package
-=========================
+\ :mod:`pyams_file.widget` package
+==================================
 
 .. automodule:: pyams_file.widget
     :members:
--- a/src/source/pyams_file/pyams_file.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_file/pyams_file.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_file.zmi:
 
-pyams_file.zmi package
-======================
+\ :mod:`pyams_file.zmi` package
+===============================
 
 .. automodule:: pyams_file.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_file\.zmi\.file module
------------------------------
+pyams_file.zmi.\ ``file``
+-------------------------
 
 .. automodule:: pyams_file.zmi.file
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_file\.zmi\.image module
-------------------------------
+pyams_file.zmi.\ ``image``
+--------------------------
 
 .. automodule:: pyams_file.zmi.image
     :members:
--- a/src/source/pyams_form/pyams_form.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_form/pyams_form.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_form.interfaces:
 
-pyams_form.interfaces package
-=============================
+\ :mod:`pyams_form.interfaces` package
+======================================
 
 .. automodule:: pyams_form.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_form\.interfaces\.form module
-------------------------------------
+pyams_form.interfaces.\ ``form``
+--------------------------------
 
 .. automodule:: pyams_form.interfaces.form
     :members:
--- a/src/source/pyams_form/pyams_form.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_form/pyams_form.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,82 +1,79 @@
 .. _pyams_form:
 
-pyams_form package
-==================
+\ :mod:`pyams_form` package
+===========================
 
 .. automodule:: pyams_form
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_form\.form module
-------------------------
+pyams_form.\ ``form``
+---------------------
 
 .. automodule:: pyams_form.form
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.group module
--------------------------
+pyams_form.\ ``group``
+----------------------
 
 .. automodule:: pyams_form.group
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.help module
-------------------------
+pyams_form.\ ``help``
+---------------------
 
 .. automodule:: pyams_form.help
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.include module
----------------------------
+pyams_form.\ ``include``
+------------------------
 
 .. automodule:: pyams_form.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.schema module
---------------------------
+pyams_form.\ ``schema``
+-----------------------
 
 .. automodule:: pyams_form.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.search module
---------------------------
+pyams_form.\ ``search``
+-----------------------
 
 .. automodule:: pyams_form.search
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.security module
-----------------------------
+pyams_form.\ ``security``
+-------------------------
 
 .. automodule:: pyams_form.security
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.terms module
--------------------------
+pyams_form.\ ``terms``
+----------------------
 
 .. automodule:: pyams_form.terms
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.viewlet module
----------------------------
+pyams_form.\ ``viewlet``
+------------------------
 
 .. automodule:: pyams_form.viewlet
     :members:
@@ -85,7 +82,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_form/pyams_form.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_form/pyams_form.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_form.tests:
 
-pyams_form.tests package
-========================
+\ :mod:`pyams_form.tests` package
+=================================
 
 .. automodule:: pyams_form.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_form\.tests\.test\_utilsdocs module
-------------------------------------------
+pyams_form.tests.\ ``test_utilsdocs``
+-------------------------------------
 
 .. automodule:: pyams_form.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_form\.tests\.test\_utilsdocstrings module
-------------------------------------------------
+pyams_form.tests.\ ``test_utilsdocstrings``
+-------------------------------------------
 
 .. automodule:: pyams_form.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_form/pyams_form.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_form/pyams_form.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_form.widget:
 
-pyams_form.widget package
-=========================
+\ :mod:`pyams_form.widget` package
+==================================
 
 .. automodule:: pyams_form.widget
     :members:
--- a/src/source/pyams_gis/pyams_gis.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_gis.interfaces:
 
-pyams_gis.interfaces package
-============================
+\ :mod:`pyams_gis.interfaces` package
+=====================================
 
 .. automodule:: pyams_gis.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_gis\.interfaces\.configuration module
---------------------------------------------
+pyams_gis.interfaces.\ ``configuration``
+----------------------------------------
 
 .. automodule:: pyams_gis.interfaces.configuration
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.interfaces\.layer module
-------------------------------------
+pyams_gis.interfaces.\ ``layer``
+--------------------------------
 
 .. automodule:: pyams_gis.interfaces.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.interfaces\.utility module
---------------------------------------
+pyams_gis.interfaces.\ ``utility``
+----------------------------------
 
 .. automodule:: pyams_gis.interfaces.utility
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.interfaces\.widget module
--------------------------------------
+pyams_gis.interfaces.\ ``widget``
+---------------------------------
 
 .. automodule:: pyams_gis.interfaces.widget
     :members:
--- a/src/source/pyams_gis/pyams_gis.rpc.json.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.rpc.json.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_gis.rpc.json:
 
-pyams_gis.rpc.json package
-==========================
+\ :mod:`pyams_gis.rpc.json` package
+===================================
 
 .. automodule:: pyams_gis.rpc.json
     :members:
--- a/src/source/pyams_gis/pyams_gis.rpc.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.rpc.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_gis.rpc:
 
-pyams_gis.rpc package
-=====================
+\ :mod:`pyams_gis.rpc` package
+==============================
 
 .. automodule:: pyams_gis.rpc
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_gis/pyams_gis.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,82 +1,79 @@
 .. _pyams_gis:
 
-pyams_gis package
-=================
+\ :mod:`pyams_gis` package
+==========================
 
 .. automodule:: pyams_gis
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_gis\.area module
------------------------
+pyams_gis.\ ``area``
+--------------------
 
 .. automodule:: pyams_gis.area
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.configuration module
---------------------------------
+pyams_gis.\ ``configuration``
+-----------------------------
 
 .. automodule:: pyams_gis.configuration
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.include module
---------------------------
+pyams_gis.\ ``include``
+-----------------------
 
 .. automodule:: pyams_gis.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.layer module
-------------------------
+pyams_gis.\ ``layer``
+---------------------
 
 .. automodule:: pyams_gis.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.point module
-------------------------
+pyams_gis.\ ``point``
+---------------------
 
 .. automodule:: pyams_gis.point
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.schema module
--------------------------
+pyams_gis.\ ``schema``
+----------------------
 
 .. automodule:: pyams_gis.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.site module
------------------------
+pyams_gis.\ ``site``
+--------------------
 
 .. automodule:: pyams_gis.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.transform module
-----------------------------
+pyams_gis.\ ``transform``
+-------------------------
 
 .. automodule:: pyams_gis.transform
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.utility module
---------------------------
+pyams_gis.\ ``utility``
+-----------------------
 
 .. automodule:: pyams_gis.utility
     :members:
@@ -85,7 +82,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_gis/pyams_gis.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_gis.tests:
 
-pyams_gis.tests package
-=======================
+\ :mod:`pyams_gis.tests` package
+================================
 
 .. automodule:: pyams_gis.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_gis\.tests\.test\_utilsdocs module
------------------------------------------
+pyams_gis.tests.\ ``test_utilsdocs``
+------------------------------------
 
 .. automodule:: pyams_gis.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.tests\.test\_utilsdocstrings module
------------------------------------------------
+pyams_gis.tests.\ ``test_utilsdocstrings``
+------------------------------------------
 
 .. automodule:: pyams_gis.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_gis/pyams_gis.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_gis.widget:
 
-pyams_gis.widget package
-========================
+\ :mod:`pyams_gis.widget` package
+=================================
 
 .. automodule:: pyams_gis.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_gis\.widget\.area module
--------------------------------
+pyams_gis.widget.\ ``area``
+---------------------------
 
 .. automodule:: pyams_gis.widget.area
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.widget\.point module
---------------------------------
+pyams_gis.widget.\ ``point``
+----------------------------
 
 .. automodule:: pyams_gis.widget.point
     :members:
--- a/src/source/pyams_gis/pyams_gis.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_gis/pyams_gis.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_gis.zmi:
 
-pyams_gis.zmi package
-=====================
+\ :mod:`pyams_gis.zmi` package
+==============================
 
 .. automodule:: pyams_gis.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_gis\.zmi\.interfaces module
-----------------------------------
+pyams_gis.zmi.\ ``interfaces``
+------------------------------
 
 .. automodule:: pyams_gis.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.zmi\.layer module
------------------------------
+pyams_gis.zmi.\ ``layer``
+-------------------------
 
 .. automodule:: pyams_gis.zmi.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_gis\.zmi\.utility module
--------------------------------
+pyams_gis.zmi.\ ``utility``
+---------------------------
 
 .. automodule:: pyams_gis.zmi.utility
     :members:
--- a/src/source/pyams_i18n/pyams_i18n.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_i18n/pyams_i18n.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_i18n.interfaces:
 
-pyams_i18n.interfaces package
-=============================
+\ :mod:`pyams_i18n.interfaces` package
+======================================
 
 .. automodule:: pyams_i18n.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_i18n\.interfaces\.schema module
---------------------------------------
+pyams_i18n.interfaces.\ ``schema``
+----------------------------------
 
 .. automodule:: pyams_i18n.interfaces.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.interfaces\.widget module
---------------------------------------
+pyams_i18n.interfaces.\ ``widget``
+----------------------------------
 
 .. automodule:: pyams_i18n.interfaces.widget
     :members:
--- a/src/source/pyams_i18n/pyams_i18n.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_i18n/pyams_i18n.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,106 +1,103 @@
 .. _pyams_i18n:
 
-pyams_i18n package
-==================
+\ :mod:`pyams_i18n` package
+===========================
 
 .. automodule:: pyams_i18n
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_i18n\.attr module
-------------------------
+pyams_i18n.\ ``attr``
+---------------------
 
 .. automodule:: pyams_i18n.attr
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.column module
---------------------------
+pyams_i18n.\ ``column``
+-----------------------
 
 .. automodule:: pyams_i18n.column
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.content module
----------------------------
+pyams_i18n.\ ``content``
+------------------------
 
 .. automodule:: pyams_i18n.content
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.expr module
-------------------------
+pyams_i18n.\ ``expr``
+---------------------
 
 .. automodule:: pyams_i18n.expr
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.include module
----------------------------
+pyams_i18n.\ ``include``
+------------------------
 
 .. automodule:: pyams_i18n.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.index module
--------------------------
+pyams_i18n.\ ``index``
+----------------------
 
 .. automodule:: pyams_i18n.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.language module
-----------------------------
+pyams_i18n.\ ``language``
+-------------------------
 
 .. automodule:: pyams_i18n.language
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.negotiator module
-------------------------------
+pyams_i18n.\ ``negotiator``
+---------------------------
 
 .. automodule:: pyams_i18n.negotiator
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.property module
-----------------------------
+pyams_i18n.\ ``property``
+-------------------------
 
 .. automodule:: pyams_i18n.property
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.schema module
---------------------------
+pyams_i18n.\ ``schema``
+-----------------------
 
 .. automodule:: pyams_i18n.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.site module
-------------------------
+pyams_i18n.\ ``site``
+---------------------
 
 .. automodule:: pyams_i18n.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.vocabulary module
-------------------------------
+pyams_i18n.\ ``vocabulary``
+---------------------------
 
 .. automodule:: pyams_i18n.vocabulary
     :members:
@@ -109,7 +106,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_i18n/pyams_i18n.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_i18n/pyams_i18n.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_i18n.widget:
 
-pyams_i18n.widget package
-=========================
+\ :mod:`pyams_i18n.widget` package
+==================================
 
 .. automodule:: pyams_i18n.widget
     :members:
--- a/src/source/pyams_i18n/pyams_i18n.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_i18n/pyams_i18n.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_i18n.zmi:
 
-pyams_i18n.zmi package
-======================
+\ :mod:`pyams_i18n.zmi` package
+===============================
 
 .. automodule:: pyams_i18n.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_i18n\.zmi\.language module
----------------------------------
+pyams_i18n.zmi.\ ``language``
+-----------------------------
 
 .. automodule:: pyams_i18n.zmi.language
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_i18n\.zmi\.negotiator module
------------------------------------
+pyams_i18n.zmi.\ ``negotiator``
+-------------------------------
 
 .. automodule:: pyams_i18n.zmi.negotiator
     :members:
--- a/src/source/pyams_ldap/pyams_ldap.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_ldap/pyams_ldap.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_ldap.interfaces:
 
-pyams_ldap.interfaces package
-=============================
+\ :mod:`pyams_ldap.interfaces` package
+======================================
 
 .. automodule:: pyams_ldap.interfaces
     :members:
--- a/src/source/pyams_ldap/pyams_ldap.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_ldap/pyams_ldap.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_ldap:
 
-pyams_ldap package
-==================
+\ :mod:`pyams_ldap` package
+===========================
 
 .. automodule:: pyams_ldap
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_ldap\.plugin module
---------------------------
+pyams_ldap.\ ``plugin``
+-----------------------
 
 .. automodule:: pyams_ldap.plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_ldap\.query module
--------------------------
+pyams_ldap.\ ``query``
+----------------------
 
 .. automodule:: pyams_ldap.query
     :members:
@@ -29,7 +26,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_ldap/pyams_ldap.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_ldap/pyams_ldap.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_ldap.tests:
 
-pyams_ldap.tests package
-========================
+\ :mod:`pyams_ldap.tests` package
+=================================
 
 .. automodule:: pyams_ldap.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_ldap\.tests\.test\_utilsdocs module
-------------------------------------------
+pyams_ldap.tests.\ ``test_utilsdocs``
+-------------------------------------
 
 .. automodule:: pyams_ldap.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_ldap\.tests\.test\_utilsdocstrings module
-------------------------------------------------
+pyams_ldap.tests.\ ``test_utilsdocstrings``
+-------------------------------------------
 
 .. automodule:: pyams_ldap.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_ldap/pyams_ldap.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_ldap/pyams_ldap.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_ldap.zmi:
 
-pyams_ldap.zmi package
-======================
+\ :mod:`pyams_ldap.zmi` package
+===============================
 
 .. automodule:: pyams_ldap.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_ldap\.zmi\.plugin module
--------------------------------
+pyams_ldap.zmi.\ ``plugin``
+---------------------------
 
 .. automodule:: pyams_ldap.zmi.plugin
     :members:
--- a/src/source/pyams_mail/pyams_mail.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_mail/pyams_mail.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_mail.interfaces:
 
-pyams_mail.interfaces package
-=============================
+\ :mod:`pyams_mail.interfaces` package
+======================================
 
 .. automodule:: pyams_mail.interfaces
     :members:
--- a/src/source/pyams_mail/pyams_mail.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_mail/pyams_mail.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_mail:
 
-pyams_mail package
-==================
+\ :mod:`pyams_mail` package
+===========================
 
 .. automodule:: pyams_mail
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_mail\.include module
----------------------------
+pyams_mail.\ ``include``
+------------------------
 
 .. automodule:: pyams_mail.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_mail\.mailer module
---------------------------
+pyams_mail.\ ``mailer``
+-----------------------
 
 .. automodule:: pyams_mail.mailer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_mail\.message module
----------------------------
+pyams_mail.\ ``message``
+------------------------
 
 .. automodule:: pyams_mail.message
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_mail/pyams_mail.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_mail/pyams_mail.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_mail.tests:
 
-pyams_mail.tests package
-========================
+\ :mod:`pyams_mail.tests` package
+=================================
 
 .. automodule:: pyams_mail.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_mail\.tests\.test\_utilsdocs module
-------------------------------------------
+pyams_mail.tests.\ ``test_utilsdocs``
+-------------------------------------
 
 .. automodule:: pyams_mail.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_mail\.tests\.test\_utilsdocstrings module
-------------------------------------------------
+pyams_mail.tests.\ ``test_utilsdocstrings``
+-------------------------------------------
 
 .. automodule:: pyams_mail.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_media/pyams_media.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_media/pyams_media.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_media.interfaces:
 
-pyams_media.interfaces package
-==============================
+\ :mod:`pyams_media.interfaces` package
+=======================================
 
 .. automodule:: pyams_media.interfaces
     :members:
--- a/src/source/pyams_media/pyams_media.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_media/pyams_media.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,98 +1,95 @@
 .. _pyams_media:
 
-pyams_media package
-===================
+\ :mod:`pyams_media` package
+============================
 
 .. automodule:: pyams_media
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_media\.audio module
---------------------------
+pyams_media.\ ``audio``
+-----------------------
 
 .. automodule:: pyams_media.audio
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.converter module
-------------------------------
+pyams_media.\ ``converter``
+---------------------------
 
 .. automodule:: pyams_media.converter
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.ffbase module
----------------------------
+pyams_media.\ ``ffbase``
+------------------------
 
 .. automodule:: pyams_media.ffbase
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.ffdocument module
--------------------------------
+pyams_media.\ ``ffdocument``
+----------------------------
 
 .. automodule:: pyams_media.ffdocument
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.ffexception module
---------------------------------
+pyams_media.\ ``ffexception``
+-----------------------------
 
 .. automodule:: pyams_media.ffexception
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.include module
-----------------------------
+pyams_media.\ ``include``
+-------------------------
 
 .. automodule:: pyams_media.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.media module
---------------------------
+pyams_media.\ ``media``
+-----------------------
 
 .. automodule:: pyams_media.media
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.process module
-----------------------------
+pyams_media.\ ``process``
+-------------------------
 
 .. automodule:: pyams_media.process
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.site module
--------------------------
+pyams_media.\ ``site``
+----------------------
 
 .. automodule:: pyams_media.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.utility module
-----------------------------
+pyams_media.\ ``utility``
+-------------------------
 
 .. automodule:: pyams_media.utility
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.video module
---------------------------
+pyams_media.\ ``video``
+-----------------------
 
 .. automodule:: pyams_media.video
     :members:
@@ -101,7 +98,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_media/pyams_media.skin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_media/pyams_media.skin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_media.skin:
 
-pyams_media.skin package
-========================
+\ :mod:`pyams_media.skin` package
+=================================
 
 .. automodule:: pyams_media.skin
     :members:
--- a/src/source/pyams_media/pyams_media.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_media/pyams_media.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_media.tests:
 
-pyams_media.tests package
-=========================
+\ :mod:`pyams_media.tests` package
+==================================
 
 .. automodule:: pyams_media.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_media\.tests\.test\_utilsdocs module
--------------------------------------------
+pyams_media.tests.\ ``test_utilsdocs``
+--------------------------------------
 
 .. automodule:: pyams_media.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.tests\.test\_utilsdocstrings module
--------------------------------------------------
+pyams_media.tests.\ ``test_utilsdocstrings``
+--------------------------------------------
 
 .. automodule:: pyams_media.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_media/pyams_media.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_media/pyams_media.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_media.zmi:
 
-pyams_media.zmi package
-=======================
+\ :mod:`pyams_media.zmi` package
+================================
 
 .. automodule:: pyams_media.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_media\.zmi\.audio module
--------------------------------
+pyams_media.zmi.\ ``audio``
+---------------------------
 
 .. automodule:: pyams_media.zmi.audio
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.zmi\.interfaces module
-------------------------------------
+pyams_media.zmi.\ ``interfaces``
+--------------------------------
 
 .. automodule:: pyams_media.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.zmi\.media module
--------------------------------
+pyams_media.zmi.\ ``media``
+---------------------------
 
 .. automodule:: pyams_media.zmi.media
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_media\.zmi\.video module
--------------------------------
+pyams_media.zmi.\ ``video``
+---------------------------
 
 .. automodule:: pyams_media.zmi.video
     :members:
--- a/src/source/pyams_notify/pyams_notify.handlers.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.handlers.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_notify.handlers:
 
-pyams_notify.handlers package
-=============================
+\ :mod:`pyams_notify.handlers` package
+======================================
 
 .. automodule:: pyams_notify.handlers
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\.handlers\.login module
--------------------------------------
+pyams_notify.handlers.\ ``login``
+---------------------------------
 
 .. automodule:: pyams_notify.handlers.login
     :members:
--- a/src/source/pyams_notify/pyams_notify.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_notify.interfaces:
 
-pyams_notify.interfaces package
-===============================
+\ :mod:`pyams_notify.interfaces` package
+========================================
 
 .. automodule:: pyams_notify.interfaces
     :members:
--- a/src/source/pyams_notify/pyams_notify.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_notify:
 
-pyams_notify package
-====================
+\ :mod:`pyams_notify` package
+=============================
 
 .. automodule:: pyams_notify
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\.event module
----------------------------
+pyams_notify.\ ``event``
+------------------------
 
 .. automodule:: pyams_notify.event
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\.include module
------------------------------
+pyams_notify.\ ``include``
+--------------------------
 
 .. automodule:: pyams_notify.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\.resources module
--------------------------------
+pyams_notify.\ ``resources``
+----------------------------
 
 .. automodule:: pyams_notify.resources
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_notify/pyams_notify.skin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.skin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_notify.skin:
 
-pyams_notify.skin package
-=========================
+\ :mod:`pyams_notify.skin` package
+==================================
 
 .. automodule:: pyams_notify.skin
     :members:
--- a/src/source/pyams_notify/pyams_notify.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_notify.tests:
 
-pyams_notify.tests package
-==========================
+\ :mod:`pyams_notify.tests` package
+===================================
 
 .. automodule:: pyams_notify.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\.tests\.test\_utilsdocs module
---------------------------------------------
+pyams_notify.tests.\ ``test_utilsdocs``
+---------------------------------------
 
 .. automodule:: pyams_notify.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\.tests\.test\_utilsdocstrings module
---------------------------------------------------
+pyams_notify.tests.\ ``test_utilsdocstrings``
+---------------------------------------------
 
 .. automodule:: pyams_notify.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_notify/pyams_notify.viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_notify.viewlet:
 
-pyams_notify.viewlet package
-============================
+\ :mod:`pyams_notify.viewlet` package
+=====================================
 
 .. automodule:: pyams_notify.viewlet
     :members:
--- a/src/source/pyams_notify/pyams_notify.views.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify/pyams_notify.views.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_notify.views:
 
-pyams_notify.views package
-==========================
+\ :mod:`pyams_notify.views` package
+===================================
 
 .. automodule:: pyams_notify.views
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\.views\.context module
-------------------------------------
+pyams_notify.views.\ ``context``
+--------------------------------
 
 .. automodule:: pyams_notify.views.context
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\.views\.notification module
------------------------------------------
+pyams_notify.views.\ ``notification``
+-------------------------------------
 
 .. automodule:: pyams_notify.views.notification
     :members:
--- a/src/source/pyams_notify_ws/pyams_notify_ws.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify_ws/pyams_notify_ws.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_notify_ws.interfaces:
 
-pyams_notify_ws.interfaces package
-==================================
+\ :mod:`pyams_notify_ws.interfaces` package
+===========================================
 
 .. automodule:: pyams_notify_ws.interfaces
     :members:
--- a/src/source/pyams_notify_ws/pyams_notify_ws.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify_ws/pyams_notify_ws.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_notify_ws:
 
-pyams_notify_ws package
-=======================
+\ :mod:`pyams_notify_ws` package
+================================
 
 .. automodule:: pyams_notify_ws
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\_ws\.include module
----------------------------------
+pyams_notify_ws.\ ``include``
+-----------------------------
 
 .. automodule:: pyams_notify_ws.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\_ws\.notify module
---------------------------------
+pyams_notify_ws.\ ``notify``
+----------------------------
 
 .. automodule:: pyams_notify_ws.notify
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\_ws\.subscribe module
------------------------------------
+pyams_notify_ws.\ ``subscribe``
+-------------------------------
 
 .. automodule:: pyams_notify_ws.subscribe
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_notify_ws/pyams_notify_ws.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_notify_ws/pyams_notify_ws.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_notify_ws.tests:
 
-pyams_notify_ws.tests package
-=============================
+\ :mod:`pyams_notify_ws.tests` package
+======================================
 
 .. automodule:: pyams_notify_ws.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_notify\_ws\.tests\.test\_utilsdocs module
-------------------------------------------------
+pyams_notify_ws.tests.\ ``test_utilsdocs``
+------------------------------------------
 
 .. automodule:: pyams_notify_ws.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_notify\_ws\.tests\.test\_utilsdocstrings module
-------------------------------------------------------
+pyams_notify_ws.tests.\ ``test_utilsdocstrings``
+------------------------------------------------
 
 .. automodule:: pyams_notify_ws.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_pagelet/pyams_pagelet.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_pagelet/pyams_pagelet.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_pagelet.interfaces:
 
-pyams_pagelet.interfaces package
-================================
+\ :mod:`pyams_pagelet.interfaces` package
+=========================================
 
 .. automodule:: pyams_pagelet.interfaces
     :members:
--- a/src/source/pyams_pagelet/pyams_pagelet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_pagelet/pyams_pagelet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_pagelet:
 
-pyams_pagelet package
-=====================
+\ :mod:`pyams_pagelet` package
+==============================
 
 .. automodule:: pyams_pagelet
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_pagelet\.metaconfigure module
-------------------------------------
+pyams_pagelet.\ ``metaconfigure``
+---------------------------------
 
 .. automodule:: pyams_pagelet.metaconfigure
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_pagelet\.metadirectives module
--------------------------------------
+pyams_pagelet.\ ``metadirectives``
+----------------------------------
 
 .. automodule:: pyams_pagelet.metadirectives
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_pagelet\.pagelet module
-------------------------------
+pyams_pagelet.\ ``pagelet``
+---------------------------
 
 .. automodule:: pyams_pagelet.pagelet
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_pagelet/pyams_pagelet.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_pagelet/pyams_pagelet.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_pagelet.tests:
 
-pyams_pagelet.tests package
-===========================
+\ :mod:`pyams_pagelet.tests` package
+====================================
 
 .. automodule:: pyams_pagelet.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_pagelet\.tests\.test\_utilsdocs module
----------------------------------------------
+pyams_pagelet.tests.\ ``test_utilsdocs``
+----------------------------------------
 
 .. automodule:: pyams_pagelet.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_pagelet\.tests\.test\_utilsdocstrings module
----------------------------------------------------
+pyams_pagelet.tests.\ ``test_utilsdocstrings``
+----------------------------------------------
 
 .. automodule:: pyams_pagelet.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_portal/pyams_portal.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_portal.interfaces:
 
-pyams_portal.interfaces package
-===============================
+\ :mod:`pyams_portal.interfaces` package
+========================================
 
 .. automodule:: pyams_portal.interfaces
     :members:
--- a/src/source/pyams_portal/pyams_portal.portlets.content.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.content.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_portal.portlets.content:
 
-pyams_portal.portlets.content package
-=====================================
+\ :mod:`pyams_portal.portlets.content` package
+==============================================
 
 .. automodule:: pyams_portal.portlets.content
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.portlets\.content\.interfaces module
----------------------------------------------------
+pyams_portal.portlets.content.\ ``interfaces``
+----------------------------------------------
 
 .. automodule:: pyams_portal.portlets.content.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_portal/pyams_portal.portlets.content.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.content.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_portal.portlets.content.zmi:
 
-pyams_portal.portlets.content.zmi package
-=========================================
+\ :mod:`pyams_portal.portlets.content.zmi` package
+==================================================
 
 .. automodule:: pyams_portal.portlets.content.zmi
     :members:
--- a/src/source/pyams_portal/pyams_portal.portlets.html.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.html.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_portal.portlets.html:
 
-pyams_portal.portlets.html package
-==================================
+\ :mod:`pyams_portal.portlets.html` package
+===========================================
 
 .. automodule:: pyams_portal.portlets.html
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.portlets\.html\.interfaces module
-------------------------------------------------
+pyams_portal.portlets.html.\ ``interfaces``
+-------------------------------------------
 
 .. automodule:: pyams_portal.portlets.html.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_portal/pyams_portal.portlets.html.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.html.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_portal.portlets.html.zmi:
 
-pyams_portal.portlets.html.zmi package
-======================================
+\ :mod:`pyams_portal.portlets.html.zmi` package
+===============================================
 
 .. automodule:: pyams_portal.portlets.html.zmi
     :members:
--- a/src/source/pyams_portal/pyams_portal.portlets.image.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.image.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_portal.portlets.image:
 
-pyams_portal.portlets.image package
-===================================
+\ :mod:`pyams_portal.portlets.image` package
+============================================
 
 .. automodule:: pyams_portal.portlets.image
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.portlets\.image\.interfaces module
--------------------------------------------------
+pyams_portal.portlets.image.\ ``interfaces``
+--------------------------------------------
 
 .. automodule:: pyams_portal.portlets.image.interfaces
     :members:
@@ -21,7 +18,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_portal/pyams_portal.portlets.image.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.image.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_portal.portlets.image.zmi:
 
-pyams_portal.portlets.image.zmi package
-=======================================
+\ :mod:`pyams_portal.portlets.image.zmi` package
+================================================
 
 .. automodule:: pyams_portal.portlets.image.zmi
     :members:
--- a/src/source/pyams_portal/pyams_portal.portlets.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.portlets.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_portal.portlets:
 
-pyams_portal.portlets package
-=============================
+\ :mod:`pyams_portal.portlets` package
+======================================
 
 .. automodule:: pyams_portal.portlets
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_portal/pyams_portal.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,66 +1,63 @@
 .. _pyams_portal:
 
-pyams_portal package
-====================
+\ :mod:`pyams_portal` package
+=============================
 
 .. automodule:: pyams_portal
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.include module
------------------------------
+pyams_portal.\ ``include``
+--------------------------
 
 .. automodule:: pyams_portal.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.page module
---------------------------
+pyams_portal.\ ``page``
+-----------------------
 
 .. automodule:: pyams_portal.page
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.portlet module
------------------------------
+pyams_portal.\ ``portlet``
+--------------------------
 
 .. automodule:: pyams_portal.portlet
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.site module
---------------------------
+pyams_portal.\ ``site``
+-----------------------
 
 .. automodule:: pyams_portal.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.slot module
---------------------------
+pyams_portal.\ ``slot``
+-----------------------
 
 .. automodule:: pyams_portal.slot
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.template module
-------------------------------
+pyams_portal.\ ``template``
+---------------------------
 
 .. automodule:: pyams_portal.template
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.views module
----------------------------
+pyams_portal.\ ``views``
+------------------------
 
 .. automodule:: pyams_portal.views
     :members:
@@ -69,7 +66,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_portal/pyams_portal.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_portal.tests:
 
-pyams_portal.tests package
-==========================
+\ :mod:`pyams_portal.tests` package
+===================================
 
 .. automodule:: pyams_portal.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.tests\.test\_utilsdocs module
---------------------------------------------
+pyams_portal.tests.\ ``test_utilsdocs``
+---------------------------------------
 
 .. automodule:: pyams_portal.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.tests\.test\_utilsdocstrings module
---------------------------------------------------
+pyams_portal.tests.\ ``test_utilsdocstrings``
+---------------------------------------------
 
 .. automodule:: pyams_portal.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_portal/pyams_portal.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_portal/pyams_portal.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_portal.zmi:
 
-pyams_portal.zmi package
-========================
+\ :mod:`pyams_portal.zmi` package
+=================================
 
 .. automodule:: pyams_portal.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_portal\.zmi\.container module
-------------------------------------
+pyams_portal.zmi.\ ``container``
+--------------------------------
 
 .. automodule:: pyams_portal.zmi.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.zmi\.interfaces module
--------------------------------------
+pyams_portal.zmi.\ ``interfaces``
+---------------------------------
 
 .. automodule:: pyams_portal.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.zmi\.layout module
----------------------------------
+pyams_portal.zmi.\ ``layout``
+-----------------------------
 
 .. automodule:: pyams_portal.zmi.layout
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.zmi\.page module
--------------------------------
+pyams_portal.zmi.\ ``page``
+---------------------------
 
 .. automodule:: pyams_portal.zmi.page
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.zmi\.portlet module
-----------------------------------
+pyams_portal.zmi.\ ``portlet``
+------------------------------
 
 .. automodule:: pyams_portal.zmi.portlet
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_portal\.zmi\.template module
------------------------------------
+pyams_portal.zmi.\ ``template``
+-------------------------------
 
 .. automodule:: pyams_portal.zmi.template
     :members:
--- a/src/source/pyams_scheduler/pyams_scheduler.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_scheduler/pyams_scheduler.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_scheduler.interfaces:
 
-pyams_scheduler.interfaces package
-==================================
+\ :mod:`pyams_scheduler.interfaces` package
+===========================================
 
 .. automodule:: pyams_scheduler.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_scheduler\.interfaces\.ssh module
-----------------------------------------
+pyams_scheduler.interfaces.\ ``ssh``
+------------------------------------
 
 .. automodule:: pyams_scheduler.interfaces.ssh
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.interfaces\.url module
-----------------------------------------
+pyams_scheduler.interfaces.\ ``url``
+------------------------------------
 
 .. automodule:: pyams_scheduler.interfaces.url
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.interfaces\.zodb module
------------------------------------------
+pyams_scheduler.interfaces.\ ``zodb``
+-------------------------------------
 
 .. automodule:: pyams_scheduler.interfaces.zodb
     :members:
--- a/src/source/pyams_scheduler/pyams_scheduler.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_scheduler/pyams_scheduler.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,82 +1,79 @@
 .. _pyams_scheduler:
 
-pyams_scheduler package
-=======================
+\ :mod:`pyams_scheduler` package
+================================
 
 .. automodule:: pyams_scheduler
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_scheduler\.include module
---------------------------------
+pyams_scheduler.\ ``include``
+-----------------------------
 
 .. automodule:: pyams_scheduler.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.process module
---------------------------------
+pyams_scheduler.\ ``process``
+-----------------------------
 
 .. automodule:: pyams_scheduler.process
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.scheduler module
-----------------------------------
+pyams_scheduler.\ ``scheduler``
+-------------------------------
 
 .. automodule:: pyams_scheduler.scheduler
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.site module
------------------------------
+pyams_scheduler.\ ``site``
+--------------------------
 
 .. automodule:: pyams_scheduler.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.ssh module
-----------------------------
+pyams_scheduler.\ ``ssh``
+-------------------------
 
 .. automodule:: pyams_scheduler.ssh
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.task module
------------------------------
+pyams_scheduler.\ ``task``
+--------------------------
 
 .. automodule:: pyams_scheduler.task
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.trigger module
---------------------------------
+pyams_scheduler.\ ``trigger``
+-----------------------------
 
 .. automodule:: pyams_scheduler.trigger
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.url module
-----------------------------
+pyams_scheduler.\ ``url``
+-------------------------
 
 .. automodule:: pyams_scheduler.url
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zodb module
------------------------------
+pyams_scheduler.\ ``zodb``
+--------------------------
 
 .. automodule:: pyams_scheduler.zodb
     :members:
@@ -85,7 +82,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_scheduler/pyams_scheduler.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_scheduler/pyams_scheduler.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_scheduler.tests:
 
-pyams_scheduler.tests package
-=============================
+\ :mod:`pyams_scheduler.tests` package
+======================================
 
 .. automodule:: pyams_scheduler.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_scheduler\.tests\.test\_utilsdocs module
------------------------------------------------
+pyams_scheduler.tests.\ ``test_utilsdocs``
+------------------------------------------
 
 .. automodule:: pyams_scheduler.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.tests\.test\_utilsdocstrings module
------------------------------------------------------
+pyams_scheduler.tests.\ ``test_utilsdocstrings``
+------------------------------------------------
 
 .. automodule:: pyams_scheduler.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_scheduler/pyams_scheduler.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_scheduler/pyams_scheduler.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_scheduler.zmi:
 
-pyams_scheduler.zmi package
-===========================
+\ :mod:`pyams_scheduler.zmi` package
+====================================
 
 .. automodule:: pyams_scheduler.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_scheduler\.zmi\.interfaces module
-----------------------------------------
+pyams_scheduler.zmi.\ ``interfaces``
+------------------------------------
 
 .. automodule:: pyams_scheduler.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zmi\.scheduler module
----------------------------------------
+pyams_scheduler.zmi.\ ``scheduler``
+-----------------------------------
 
 .. automodule:: pyams_scheduler.zmi.scheduler
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zmi\.ssh module
----------------------------------
+pyams_scheduler.zmi.\ ``ssh``
+-----------------------------
 
 .. automodule:: pyams_scheduler.zmi.ssh
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zmi\.task module
-----------------------------------
+pyams_scheduler.zmi.\ ``task``
+------------------------------
 
 .. automodule:: pyams_scheduler.zmi.task
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zmi\.url module
----------------------------------
+pyams_scheduler.zmi.\ ``url``
+-----------------------------
 
 .. automodule:: pyams_scheduler.zmi.url
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_scheduler\.zmi\.zodb module
-----------------------------------
+pyams_scheduler.zmi.\ ``zodb``
+------------------------------
 
 .. automodule:: pyams_scheduler.zmi.zodb
     :members:
--- a/src/source/pyams_security/pyams_security.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_security.interfaces:
 
-pyams_security.interfaces package
-=================================
+\ :mod:`pyams_security.interfaces` package
+==========================================
 
 .. automodule:: pyams_security.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.interfaces\.notification module
-------------------------------------------------
+pyams_security.interfaces.\ ``notification``
+--------------------------------------------
 
 .. automodule:: pyams_security.interfaces.notification
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.interfaces\.profile module
--------------------------------------------
+pyams_security.interfaces.\ ``profile``
+---------------------------------------
 
 .. automodule:: pyams_security.interfaces.profile
     :members:
--- a/src/source/pyams_security/pyams_security.plugin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.plugin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_security.plugin:
 
-pyams_security.plugin package
-=============================
+\ :mod:`pyams_security.plugin` package
+======================================
 
 .. automodule:: pyams_security.plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.plugin\.admin module
--------------------------------------
+pyams_security.plugin.\ ``admin``
+---------------------------------
 
 .. automodule:: pyams_security.plugin.admin
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.plugin\.group module
--------------------------------------
+pyams_security.plugin.\ ``group``
+---------------------------------
 
 .. automodule:: pyams_security.plugin.group
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.plugin\.http module
-------------------------------------
+pyams_security.plugin.\ ``http``
+--------------------------------
 
 .. automodule:: pyams_security.plugin.http
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.plugin\.social module
---------------------------------------
+pyams_security.plugin.\ ``social``
+----------------------------------
 
 .. automodule:: pyams_security.plugin.social
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.plugin\.userfolder module
-------------------------------------------
+pyams_security.plugin.\ ``userfolder``
+--------------------------------------
 
 .. automodule:: pyams_security.plugin.userfolder
     :members:
--- a/src/source/pyams_security/pyams_security.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,122 +1,119 @@
 .. _pyams_security:
 
-pyams_security package
-======================
+\ :mod:`pyams_security` package
+===============================
 
 .. automodule:: pyams_security
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.credential module
-----------------------------------
+pyams_security.\ ``credential``
+-------------------------------
 
 .. automodule:: pyams_security.credential
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.include module
--------------------------------
+pyams_security.\ ``include``
+----------------------------
 
 .. automodule:: pyams_security.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.index module
------------------------------
+pyams_security.\ ``index``
+--------------------------
 
 .. automodule:: pyams_security.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.notification module
-------------------------------------
+pyams_security.\ ``notification``
+---------------------------------
 
 .. automodule:: pyams_security.notification
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.permission module
-----------------------------------
+pyams_security.\ ``permission``
+-------------------------------
 
 .. automodule:: pyams_security.permission
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.principal module
----------------------------------
+pyams_security.\ ``principal``
+------------------------------
 
 .. automodule:: pyams_security.principal
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.profile module
--------------------------------
+pyams_security.\ ``profile``
+----------------------------
 
 .. automodule:: pyams_security.profile
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.property module
---------------------------------
+pyams_security.\ ``property``
+-----------------------------
 
 .. automodule:: pyams_security.property
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.role module
-----------------------------
+pyams_security.\ ``role``
+-------------------------
 
 .. automodule:: pyams_security.role
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.schema module
-------------------------------
+pyams_security.\ ``schema``
+---------------------------
 
 .. automodule:: pyams_security.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.security module
---------------------------------
+pyams_security.\ ``security``
+-----------------------------
 
 .. automodule:: pyams_security.security
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.site module
-----------------------------
+pyams_security.\ ``site``
+-------------------------
 
 .. automodule:: pyams_security.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.utility module
--------------------------------
+pyams_security.\ ``utility``
+----------------------------
 
 .. automodule:: pyams_security.utility
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.vocabulary module
-----------------------------------
+pyams_security.\ ``vocabulary``
+-------------------------------
 
 .. automodule:: pyams_security.vocabulary
     :members:
@@ -125,7 +122,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_security/pyams_security.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_security.tests:
 
-pyams_security.tests package
-============================
+\ :mod:`pyams_security.tests` package
+=====================================
 
 .. automodule:: pyams_security.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.tests\.test\_utilsdocs module
-----------------------------------------------
+pyams_security.tests.\ ``test_utilsdocs``
+-----------------------------------------
 
 .. automodule:: pyams_security.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.tests\.test\_utilsdocstrings module
-----------------------------------------------------
+pyams_security.tests.\ ``test_utilsdocstrings``
+-----------------------------------------------
 
 .. automodule:: pyams_security.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_security/pyams_security.views.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.views.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_security.views:
 
-pyams_security.views package
-============================
+\ :mod:`pyams_security.views` package
+=====================================
 
 .. automodule:: pyams_security.views
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.views\.login module
-------------------------------------
+pyams_security.views.\ ``login``
+--------------------------------
 
 .. automodule:: pyams_security.views.login
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.views\.oauth module
-------------------------------------
+pyams_security.views.\ ``oauth``
+--------------------------------
 
 .. automodule:: pyams_security.views.oauth
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.views\.userfolder module
------------------------------------------
+pyams_security.views.\ ``userfolder``
+-------------------------------------
 
 .. automodule:: pyams_security.views.userfolder
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.views\.utility module
---------------------------------------
+pyams_security.views.\ ``utility``
+----------------------------------
 
 .. automodule:: pyams_security.views.utility
     :members:
--- a/src/source/pyams_security/pyams_security.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_security.widget:
 
-pyams_security.widget package
-=============================
+\ :mod:`pyams_security.widget` package
+======================================
 
 .. automodule:: pyams_security.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.widget\.interfaces module
-------------------------------------------
+pyams_security.widget.\ ``interfaces``
+--------------------------------------
 
 .. automodule:: pyams_security.widget.interfaces
     :members:
--- a/src/source/pyams_security/pyams_security.zmi.plugin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.zmi.plugin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_security.zmi.plugin:
 
-pyams_security.zmi.plugin package
-=================================
+\ :mod:`pyams_security.zmi.plugin` package
+==========================================
 
 .. automodule:: pyams_security.zmi.plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.zmi\.plugin\.admin module
-------------------------------------------
+pyams_security.zmi.plugin.\ ``admin``
+-------------------------------------
 
 .. automodule:: pyams_security.zmi.plugin.admin
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.plugin\.group module
-------------------------------------------
+pyams_security.zmi.plugin.\ ``group``
+-------------------------------------
 
 .. automodule:: pyams_security.zmi.plugin.group
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.plugin\.social module
--------------------------------------------
+pyams_security.zmi.plugin.\ ``social``
+--------------------------------------
 
 .. automodule:: pyams_security.zmi.plugin.social
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.plugin\.userfolder module
------------------------------------------------
+pyams_security.zmi.plugin.\ ``userfolder``
+------------------------------------------
 
 .. automodule:: pyams_security.zmi.plugin.userfolder
     :members:
--- a/src/source/pyams_security/pyams_security.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_security.zmi:
 
-pyams_security.zmi package
-==========================
+\ :mod:`pyams_security.zmi` package
+===================================
 
 .. automodule:: pyams_security.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_security\.zmi\.interfaces module
----------------------------------------
+pyams_security.zmi.\ ``interfaces``
+-----------------------------------
 
 .. automodule:: pyams_security.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.notification module
------------------------------------------
+pyams_security.zmi.\ ``notification``
+-------------------------------------
 
 .. automodule:: pyams_security.zmi.notification
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.profile module
-------------------------------------
+pyams_security.zmi.\ ``profile``
+--------------------------------
 
 .. automodule:: pyams_security.zmi.profile
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.security module
--------------------------------------
+pyams_security.zmi.\ ``security``
+---------------------------------
 
 .. automodule:: pyams_security.zmi.security
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_security\.zmi\.utility module
-------------------------------------
+pyams_security.zmi.\ ``utility``
+--------------------------------
 
 .. automodule:: pyams_security.zmi.utility
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_security/pyams_security.zmi.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_security/pyams_security.zmi.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_security.zmi.widget:
 
-pyams_security.zmi.widget package
-=================================
+\ :mod:`pyams_security.zmi.widget` package
+==========================================
 
 .. automodule:: pyams_security.zmi.widget
     :members:
--- a/src/source/pyams_sequence/pyams_sequence.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_sequence.interfaces:
 
-pyams_sequence.interfaces package
-=================================
+\ :mod:`pyams_sequence.interfaces` package
+==========================================
 
 .. automodule:: pyams_sequence.interfaces
     :members:
--- a/src/source/pyams_sequence/pyams_sequence.rpc.json.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.rpc.json.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_sequence.rpc.json:
 
-pyams_sequence.rpc.json package
-===============================
+\ :mod:`pyams_sequence.rpc.json` package
+========================================
 
 .. automodule:: pyams_sequence.rpc.json
     :members:
--- a/src/source/pyams_sequence/pyams_sequence.rpc.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.rpc.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_sequence.rpc:
 
-pyams_sequence.rpc package
-==========================
+\ :mod:`pyams_sequence.rpc` package
+===================================
 
 .. automodule:: pyams_sequence.rpc
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_sequence/pyams_sequence.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_sequence:
 
-pyams_sequence package
-======================
+\ :mod:`pyams_sequence` package
+===============================
 
 .. automodule:: pyams_sequence
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_sequence\.include module
--------------------------------
+pyams_sequence.\ ``include``
+----------------------------
 
 .. automodule:: pyams_sequence.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_sequence\.schema module
-------------------------------
+pyams_sequence.\ ``schema``
+---------------------------
 
 .. automodule:: pyams_sequence.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_sequence\.sequence module
---------------------------------
+pyams_sequence.\ ``sequence``
+-----------------------------
 
 .. automodule:: pyams_sequence.sequence
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_sequence\.site module
-----------------------------
+pyams_sequence.\ ``site``
+-------------------------
 
 .. automodule:: pyams_sequence.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_sequence\.utility module
--------------------------------
+pyams_sequence.\ ``utility``
+----------------------------
 
 .. automodule:: pyams_sequence.utility
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_sequence/pyams_sequence.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_sequence.tests:
 
-pyams_sequence.tests package
-============================
+\ :mod:`pyams_sequence.tests` package
+=====================================
 
 .. automodule:: pyams_sequence.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_sequence\.tests\.test\_utilsdocs module
-----------------------------------------------
+pyams_sequence.tests.\ ``test_utilsdocs``
+-----------------------------------------
 
 .. automodule:: pyams_sequence.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_sequence\.tests\.test\_utilsdocstrings module
-----------------------------------------------------
+pyams_sequence.tests.\ ``test_utilsdocstrings``
+-----------------------------------------------
 
 .. automodule:: pyams_sequence.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_sequence/pyams_sequence.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_sequence.widget:
 
-pyams_sequence.widget package
-=============================
+\ :mod:`pyams_sequence.widget` package
+======================================
 
 .. automodule:: pyams_sequence.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_sequence\.widget\.interfaces module
-------------------------------------------
+pyams_sequence.widget.\ ``interfaces``
+--------------------------------------
 
 .. automodule:: pyams_sequence.widget.interfaces
     :members:
--- a/src/source/pyams_sequence/pyams_sequence.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_sequence/pyams_sequence.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_sequence.zmi:
 
-pyams_sequence.zmi package
-==========================
+\ :mod:`pyams_sequence.zmi` package
+===================================
 
 .. automodule:: pyams_sequence.zmi
     :members:
--- a/src/source/pyams_skin/pyams_skin.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,66 +1,63 @@
 .. _pyams_skin.interfaces:
 
-pyams_skin.interfaces package
-=============================
+\ :mod:`pyams_skin.interfaces` package
+======================================
 
 .. automodule:: pyams_skin.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_skin\.interfaces\.configuration module
----------------------------------------------
+pyams_skin.interfaces.\ ``configuration``
+-----------------------------------------
 
 .. automodule:: pyams_skin.interfaces.configuration
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.container module
------------------------------------------
+pyams_skin.interfaces.\ ``container``
+-------------------------------------
 
 .. automodule:: pyams_skin.interfaces.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.extension module
------------------------------------------
+pyams_skin.interfaces.\ ``extension``
+-------------------------------------
 
 .. automodule:: pyams_skin.interfaces.extension
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.metas module
--------------------------------------
+pyams_skin.interfaces.\ ``metas``
+---------------------------------
 
 .. automodule:: pyams_skin.interfaces.metas
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.resources module
------------------------------------------
+pyams_skin.interfaces.\ ``resources``
+-------------------------------------
 
 .. automodule:: pyams_skin.interfaces.resources
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.tinymce module
----------------------------------------
+pyams_skin.interfaces.\ ``tinymce``
+-----------------------------------
 
 .. automodule:: pyams_skin.interfaces.tinymce
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.interfaces\.viewlet module
----------------------------------------
+pyams_skin.interfaces.\ ``viewlet``
+-----------------------------------
 
 .. automodule:: pyams_skin.interfaces.viewlet
     :members:
--- a/src/source/pyams_skin/pyams_skin.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,106 +1,111 @@
 .. _pyams_skin:
 
-pyams_skin package
-==================
+\ :mod:`pyams_skin` package
+===========================
 
 .. automodule:: pyams_skin
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_skin\.configuration module
----------------------------------
+pyams_skin.\ ``configuration``
+------------------------------
 
 .. automodule:: pyams_skin.configuration
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.container module
------------------------------
+pyams_skin.\ ``container``
+--------------------------
 
 .. automodule:: pyams_skin.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.extension module
------------------------------
+pyams_skin.\ ``event``
+----------------------
+
+.. automodule:: pyams_skin.event
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pyams_skin.\ ``extension``
+--------------------------
 
 .. automodule:: pyams_skin.extension
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.help module
-------------------------
+pyams_skin.\ ``help``
+---------------------
 
 .. automodule:: pyams_skin.help
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.layer module
--------------------------
+pyams_skin.\ ``layer``
+----------------------
 
 .. automodule:: pyams_skin.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.metas module
--------------------------
+pyams_skin.\ ``metas``
+----------------------
 
 .. automodule:: pyams_skin.metas
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.page module
-------------------------
+pyams_skin.\ ``page``
+---------------------
 
 .. automodule:: pyams_skin.page
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.resources module
------------------------------
+pyams_skin.\ ``resources``
+--------------------------
 
 .. automodule:: pyams_skin.resources
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.site module
-------------------------
+pyams_skin.\ ``site``
+---------------------
 
 .. automodule:: pyams_skin.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.skin module
-------------------------
+pyams_skin.\ ``skin``
+---------------------
 
 .. automodule:: pyams_skin.skin
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.table module
--------------------------
+pyams_skin.\ ``table``
+----------------------
 
 .. automodule:: pyams_skin.table
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.vocabulary module
-------------------------------
+pyams_skin.\ ``vocabulary``
+---------------------------
 
 .. automodule:: pyams_skin.vocabulary
     :members:
@@ -109,7 +114,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_skin/pyams_skin.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_skin.tests:
 
-pyams_skin.tests package
-========================
+\ :mod:`pyams_skin.tests` package
+=================================
 
 .. automodule:: pyams_skin.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_skin\.tests\.test\_utilsdocs module
-------------------------------------------
+pyams_skin.tests.\ ``test_utilsdocs``
+-------------------------------------
 
 .. automodule:: pyams_skin.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.tests\.test\_utilsdocstrings module
-------------------------------------------------
+pyams_skin.tests.\ ``test_utilsdocstrings``
+-------------------------------------------
 
 .. automodule:: pyams_skin.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.activity.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.activity.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.activity:
 
-pyams_skin.viewlet.activity package
-===================================
+\ :mod:`pyams_skin.viewlet.activity` package
+============================================
 
 .. automodule:: pyams_skin.viewlet.activity
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.breadcrumb.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.breadcrumb.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.breadcrumb:
 
-pyams_skin.viewlet.breadcrumb package
-=====================================
+\ :mod:`pyams_skin.viewlet.breadcrumb` package
+==============================================
 
 .. automodule:: pyams_skin.viewlet.breadcrumb
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.extension.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.extension.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_skin.viewlet.extension:
 
-pyams_skin.viewlet.extension package
-====================================
+\ :mod:`pyams_skin.viewlet.extension` package
+=============================================
 
 .. automodule:: pyams_skin.viewlet.extension
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_skin\.viewlet\.extension\.analytics module
--------------------------------------------------
+pyams_skin.viewlet.extension.\ ``analytics``
+--------------------------------------------
 
 .. automodule:: pyams_skin.viewlet.extension.analytics
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.viewlet\.extension\.tagmanager module
---------------------------------------------------
+pyams_skin.viewlet.extension.\ ``tagmanager``
+---------------------------------------------
 
 .. automodule:: pyams_skin.viewlet.extension.tagmanager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_skin\.viewlet\.extension\.user\_report module
-----------------------------------------------------
+pyams_skin.viewlet.extension.\ ``user_report``
+----------------------------------------------
 
 .. automodule:: pyams_skin.viewlet.extension.user_report
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.flags.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.flags.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.flags:
 
-pyams_skin.viewlet.flags package
-================================
+\ :mod:`pyams_skin.viewlet.flags` package
+=========================================
 
 .. automodule:: pyams_skin.viewlet.flags
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.menu.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.menu.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.menu:
 
-pyams_skin.viewlet.menu package
-===============================
+\ :mod:`pyams_skin.viewlet.menu` package
+========================================
 
 .. automodule:: pyams_skin.viewlet.menu
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet:
 
-pyams_skin.viewlet package
-==========================
+\ :mod:`pyams_skin.viewlet` package
+===================================
 
 .. automodule:: pyams_skin.viewlet
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_skin/pyams_skin.viewlet.search.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.search.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.search:
 
-pyams_skin.viewlet.search package
-=================================
+\ :mod:`pyams_skin.viewlet.search` package
+==========================================
 
 .. automodule:: pyams_skin.viewlet.search
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.shortcuts.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.shortcuts.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.shortcuts:
 
-pyams_skin.viewlet.shortcuts package
-====================================
+\ :mod:`pyams_skin.viewlet.shortcuts` package
+=============================================
 
 .. automodule:: pyams_skin.viewlet.shortcuts
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.toolbar.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.toolbar.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.toolbar:
 
-pyams_skin.viewlet.toolbar package
-==================================
+\ :mod:`pyams_skin.viewlet.toolbar` package
+===========================================
 
 .. automodule:: pyams_skin.viewlet.toolbar
     :members:
--- a/src/source/pyams_skin/pyams_skin.viewlet.toplinks.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_skin/pyams_skin.viewlet.toplinks.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_skin.viewlet.toplinks:
 
-pyams_skin.viewlet.toplinks package
-===================================
+\ :mod:`pyams_skin.viewlet.toplinks` package
+============================================
 
 .. automodule:: pyams_skin.viewlet.toplinks
     :members:
--- a/src/source/pyams_template/pyams_template.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_template/pyams_template.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_template.interfaces:
 
-pyams_template.interfaces package
-=================================
+\ :mod:`pyams_template.interfaces` package
+==========================================
 
 .. automodule:: pyams_template.interfaces
     :members:
--- a/src/source/pyams_template/pyams_template.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_template/pyams_template.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_template:
 
-pyams_template package
-======================
+\ :mod:`pyams_template` package
+===============================
 
 .. automodule:: pyams_template
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_template\.metaconfigure module
--------------------------------------
+pyams_template.\ ``metaconfigure``
+----------------------------------
 
 .. automodule:: pyams_template.metaconfigure
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_template\.metadirectives module
---------------------------------------
+pyams_template.\ ``metadirectives``
+-----------------------------------
 
 .. automodule:: pyams_template.metadirectives
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_template\.template module
---------------------------------
+pyams_template.\ ``template``
+-----------------------------
 
 .. automodule:: pyams_template.template
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_template/pyams_template.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_template/pyams_template.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_template.tests:
 
-pyams_template.tests package
-============================
+\ :mod:`pyams_template.tests` package
+=====================================
 
 .. automodule:: pyams_template.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_template\.tests\.test\_utilsdocs module
-----------------------------------------------
+pyams_template.tests.\ ``test_utilsdocs``
+-----------------------------------------
 
 .. automodule:: pyams_template.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_template\.tests\.test\_utilsdocstrings module
-----------------------------------------------------
+pyams_template.tests.\ ``test_utilsdocstrings``
+-----------------------------------------------
 
 .. automodule:: pyams_template.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_thesaurus.interfaces:
 
-pyams_thesaurus.interfaces package
-==================================
+\ :mod:`pyams_thesaurus.interfaces` package
+===========================================
 
 .. automodule:: pyams_thesaurus.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.interfaces\.extension module
-----------------------------------------------
+pyams_thesaurus.interfaces.\ ``extension``
+------------------------------------------
 
 .. automodule:: pyams_thesaurus.interfaces.extension
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.interfaces\.index module
-------------------------------------------
+pyams_thesaurus.interfaces.\ ``index``
+--------------------------------------
 
 .. automodule:: pyams_thesaurus.interfaces.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.interfaces\.loader module
--------------------------------------------
+pyams_thesaurus.interfaces.\ ``loader``
+---------------------------------------
 
 .. automodule:: pyams_thesaurus.interfaces.loader
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.interfaces\.term module
------------------------------------------
+pyams_thesaurus.interfaces.\ ``term``
+-------------------------------------
 
 .. automodule:: pyams_thesaurus.interfaces.term
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.interfaces\.thesaurus module
-----------------------------------------------
+pyams_thesaurus.interfaces.\ ``thesaurus``
+------------------------------------------
 
 .. automodule:: pyams_thesaurus.interfaces.thesaurus
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.loader.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.loader.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_thesaurus.loader:
 
-pyams_thesaurus.loader package
-==============================
+\ :mod:`pyams_thesaurus.loader` package
+=======================================
 
 .. automodule:: pyams_thesaurus.loader
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.loader\.config module
----------------------------------------
+pyams_thesaurus.loader.\ ``config``
+-----------------------------------
 
 .. automodule:: pyams_thesaurus.loader.config
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.loader\.skos module
--------------------------------------
+pyams_thesaurus.loader.\ ``skos``
+---------------------------------
 
 .. automodule:: pyams_thesaurus.loader.skos
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.loader\.superdoc module
------------------------------------------
+pyams_thesaurus.loader.\ ``superdoc``
+-------------------------------------
 
 .. automodule:: pyams_thesaurus.loader.superdoc
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.rpc.json.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.rpc.json.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_thesaurus.rpc.json:
 
-pyams_thesaurus.rpc.json package
-================================
+\ :mod:`pyams_thesaurus.rpc.json` package
+=========================================
 
 .. automodule:: pyams_thesaurus.rpc.json
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.rpc.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.rpc.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_thesaurus.rpc:
 
-pyams_thesaurus.rpc package
-===========================
+\ :mod:`pyams_thesaurus.rpc` package
+====================================
 
 .. automodule:: pyams_thesaurus.rpc
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_thesaurus/pyams_thesaurus.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_thesaurus:
 
-pyams_thesaurus package
-=======================
+\ :mod:`pyams_thesaurus` package
+================================
 
 .. automodule:: pyams_thesaurus
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.include module
---------------------------------
+pyams_thesaurus.\ ``include``
+-----------------------------
 
 .. automodule:: pyams_thesaurus.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.index module
-------------------------------
+pyams_thesaurus.\ ``index``
+---------------------------
 
 .. automodule:: pyams_thesaurus.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.schema module
--------------------------------
+pyams_thesaurus.\ ``schema``
+----------------------------
 
 .. automodule:: pyams_thesaurus.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.term module
------------------------------
+pyams_thesaurus.\ ``term``
+--------------------------
 
 .. automodule:: pyams_thesaurus.term
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.thesaurus module
-----------------------------------
+pyams_thesaurus.\ ``thesaurus``
+-------------------------------
 
 .. automodule:: pyams_thesaurus.thesaurus
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_thesaurus/pyams_thesaurus.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_thesaurus.tests:
 
-pyams_thesaurus.tests package
-=============================
+\ :mod:`pyams_thesaurus.tests` package
+======================================
 
 .. automodule:: pyams_thesaurus.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.tests\.test\_utilsdocs module
------------------------------------------------
+pyams_thesaurus.tests.\ ``test_utilsdocs``
+------------------------------------------
 
 .. automodule:: pyams_thesaurus.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.tests\.test\_utilsdocstrings module
------------------------------------------------------
+pyams_thesaurus.tests.\ ``test_utilsdocstrings``
+------------------------------------------------
 
 .. automodule:: pyams_thesaurus.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_thesaurus.widget:
 
-pyams_thesaurus.widget package
-==============================
+\ :mod:`pyams_thesaurus.widget` package
+=======================================
 
 .. automodule:: pyams_thesaurus.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.widget\.interfaces module
--------------------------------------------
+pyams_thesaurus.widget.\ ``interfaces``
+---------------------------------------
 
 .. automodule:: pyams_thesaurus.widget.interfaces
     :members:
--- a/src/source/pyams_thesaurus/pyams_thesaurus.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_thesaurus/pyams_thesaurus.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_thesaurus.zmi:
 
-pyams_thesaurus.zmi package
-===========================
+\ :mod:`pyams_thesaurus.zmi` package
+====================================
 
 .. automodule:: pyams_thesaurus.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_thesaurus\.zmi\.extract module
--------------------------------------
+pyams_thesaurus.zmi.\ ``extract``
+---------------------------------
 
 .. automodule:: pyams_thesaurus.zmi.extract
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.zmi\.interfaces module
-----------------------------------------
+pyams_thesaurus.zmi.\ ``interfaces``
+------------------------------------
 
 .. automodule:: pyams_thesaurus.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.zmi\.manager module
--------------------------------------
+pyams_thesaurus.zmi.\ ``manager``
+---------------------------------
 
 .. automodule:: pyams_thesaurus.zmi.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.zmi\.term module
-----------------------------------
+pyams_thesaurus.zmi.\ ``term``
+------------------------------
 
 .. automodule:: pyams_thesaurus.zmi.term
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_thesaurus\.zmi\.thesaurus module
----------------------------------------
+pyams_thesaurus.zmi.\ ``thesaurus``
+-----------------------------------
 
 .. automodule:: pyams_thesaurus.zmi.thesaurus
     :members:
--- a/src/source/pyams_utils/pyams_utils.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,98 +1,95 @@
 .. _pyams_utils.interfaces:
 
-pyams_utils.interfaces package
-==============================
+\ :mod:`pyams_utils.interfaces` package
+=======================================
 
 .. automodule:: pyams_utils.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.interfaces\.data module
--------------------------------------
+pyams_utils.interfaces.\ ``data``
+---------------------------------
 
 .. automodule:: pyams_utils.interfaces.data
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.inherit module
-----------------------------------------
+pyams_utils.interfaces.\ ``inherit``
+------------------------------------
 
 .. automodule:: pyams_utils.interfaces.inherit
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.intids module
----------------------------------------
+pyams_utils.interfaces.\ ``intids``
+-----------------------------------
 
 .. automodule:: pyams_utils.interfaces.intids
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.site module
--------------------------------------
+pyams_utils.interfaces.\ ``site``
+---------------------------------
 
 .. automodule:: pyams_utils.interfaces.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.size module
--------------------------------------
+pyams_utils.interfaces.\ ``size``
+---------------------------------
 
 .. automodule:: pyams_utils.interfaces.size
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.tales module
---------------------------------------
+pyams_utils.interfaces.\ ``tales``
+----------------------------------
 
 .. automodule:: pyams_utils.interfaces.tales
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.text module
--------------------------------------
+pyams_utils.interfaces.\ ``text``
+---------------------------------
 
 .. automodule:: pyams_utils.interfaces.text
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.timezone module
------------------------------------------
+pyams_utils.interfaces.\ ``timezone``
+-------------------------------------
 
 .. automodule:: pyams_utils.interfaces.timezone
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.traversing module
--------------------------------------------
+pyams_utils.interfaces.\ ``traversing``
+---------------------------------------
 
 .. automodule:: pyams_utils.interfaces.traversing
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.tree module
--------------------------------------
+pyams_utils.interfaces.\ ``tree``
+---------------------------------
 
 .. automodule:: pyams_utils.interfaces.tree
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.interfaces\.zeo module
-------------------------------------
+pyams_utils.interfaces.\ ``zeo``
+--------------------------------
 
 .. automodule:: pyams_utils.interfaces.zeo
     :members:
--- a/src/source/pyams_utils/pyams_utils.protocol.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.protocol.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_utils.protocol:
 
-pyams_utils.protocol package
-============================
+\ :mod:`pyams_utils.protocol` package
+=====================================
 
 .. automodule:: pyams_utils.protocol
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.protocol\.http module
------------------------------------
+pyams_utils.protocol.\ ``http``
+-------------------------------
 
 .. automodule:: pyams_utils.protocol.http
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.protocol\.xmlrpc module
--------------------------------------
+pyams_utils.protocol.\ ``xmlrpc``
+---------------------------------
 
 .. automodule:: pyams_utils.protocol.xmlrpc
     :members:
--- a/src/source/pyams_utils/pyams_utils.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,274 +1,279 @@
 .. _pyams_utils:
 
-pyams_utils package
-===================
+\ :mod:`pyams_utils` package
+============================
 
 .. automodule:: pyams_utils
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.adapter module
-----------------------------
+pyams_utils.\ ``adapter``
+-------------------------
 
 .. automodule:: pyams_utils.adapter
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.attr module
--------------------------
+pyams_utils.\ ``attr``
+----------------------
 
 .. automodule:: pyams_utils.attr
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.container module
-------------------------------
+pyams_utils.\ ``cache``
+-----------------------
+
+.. automodule:: pyams_utils.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pyams_utils.\ ``container``
+---------------------------
 
 .. automodule:: pyams_utils.container
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.context module
-----------------------------
+pyams_utils.\ ``context``
+-------------------------
 
 .. automodule:: pyams_utils.context
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.data module
--------------------------
+pyams_utils.\ ``data``
+----------------------
 
 .. automodule:: pyams_utils.data
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.date module
--------------------------
+pyams_utils.\ ``date``
+----------------------
 
 .. automodule:: pyams_utils.date
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.decorator module
-------------------------------
+pyams_utils.\ ``decorator``
+---------------------------
 
 .. automodule:: pyams_utils.decorator
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.dict module
--------------------------
+pyams_utils.\ ``dict``
+----------------------
 
 .. automodule:: pyams_utils.dict
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.encoding module
------------------------------
+pyams_utils.\ ``encoding``
+--------------------------
 
 .. automodule:: pyams_utils.encoding
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.fanstatic module
-------------------------------
+pyams_utils.\ ``fanstatic``
+---------------------------
 
 .. automodule:: pyams_utils.fanstatic
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.html module
--------------------------
+pyams_utils.\ ``html``
+----------------------
 
 .. automodule:: pyams_utils.html
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.i18n module
--------------------------
+pyams_utils.\ ``i18n``
+----------------------
 
 .. automodule:: pyams_utils.i18n
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.include module
-----------------------------
+pyams_utils.\ ``include``
+-------------------------
 
 .. automodule:: pyams_utils.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.inherit module
-----------------------------
+pyams_utils.\ ``inherit``
+-------------------------
 
 .. automodule:: pyams_utils.inherit
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.intids module
----------------------------
+pyams_utils.\ ``intids``
+------------------------
 
 .. automodule:: pyams_utils.intids
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.list module
--------------------------
+pyams_utils.\ ``list``
+----------------------
 
 .. automodule:: pyams_utils.list
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.lock module
--------------------------
+pyams_utils.\ ``lock``
+----------------------
 
 .. automodule:: pyams_utils.lock
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.progress module
------------------------------
+pyams_utils.\ ``progress``
+--------------------------
 
 .. automodule:: pyams_utils.progress
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.property module
------------------------------
+pyams_utils.\ ``property``
+--------------------------
 
 .. automodule:: pyams_utils.property
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.registry module
------------------------------
+pyams_utils.\ ``registry``
+--------------------------
 
 .. automodule:: pyams_utils.registry
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.request module
-----------------------------
+pyams_utils.\ ``request``
+-------------------------
 
 .. automodule:: pyams_utils.request
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.schema module
----------------------------
+pyams_utils.\ ``schema``
+------------------------
 
 .. automodule:: pyams_utils.schema
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.session module
-----------------------------
+pyams_utils.\ ``session``
+-------------------------
 
 .. automodule:: pyams_utils.session
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.site module
--------------------------
+pyams_utils.\ ``site``
+----------------------
 
 .. automodule:: pyams_utils.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.size module
--------------------------
+pyams_utils.\ ``size``
+----------------------
 
 .. automodule:: pyams_utils.size
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.tales module
---------------------------
+pyams_utils.\ ``tales``
+-----------------------
 
 .. automodule:: pyams_utils.tales
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.text module
--------------------------
+pyams_utils.\ ``text``
+----------------------
 
 .. automodule:: pyams_utils.text
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.traversing module
--------------------------------
+pyams_utils.\ ``traversing``
+----------------------------
 
 .. automodule:: pyams_utils.traversing
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.unicode module
-----------------------------
+pyams_utils.\ ``unicode``
+-------------------------
 
 .. automodule:: pyams_utils.unicode
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.url module
-------------------------
+pyams_utils.\ ``url``
+---------------------
 
 .. automodule:: pyams_utils.url
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.vocabulary module
--------------------------------
+pyams_utils.\ ``vocabulary``
+----------------------------
 
 .. automodule:: pyams_utils.vocabulary
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.wsgi module
--------------------------
+pyams_utils.\ ``wsgi``
+----------------------
 
 .. automodule:: pyams_utils.wsgi
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.zodb module
--------------------------
+pyams_utils.\ ``zodb``
+----------------------
 
 .. automodule:: pyams_utils.zodb
     :members:
@@ -277,7 +282,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_utils/pyams_utils.scripts.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.scripts.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_utils.scripts:
 
-pyams_utils.scripts package
-===========================
+\ :mod:`pyams_utils.scripts` package
+====================================
 
 .. automodule:: pyams_utils.scripts
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.scripts\.zodb module
-----------------------------------
+pyams_utils.scripts.\ ``zodb``
+------------------------------
 
 .. automodule:: pyams_utils.scripts.zodb
     :members:
--- a/src/source/pyams_utils/pyams_utils.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_utils.tests:
 
-pyams_utils.tests package
-=========================
+\ :mod:`pyams_utils.tests` package
+==================================
 
 .. automodule:: pyams_utils.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.tests\.test\_utilsdocs module
--------------------------------------------
+pyams_utils.tests.\ ``test_utilsdocs``
+--------------------------------------
 
 .. automodule:: pyams_utils.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.tests\.test\_utilsdocstrings module
--------------------------------------------------
+pyams_utils.tests.\ ``test_utilsdocstrings``
+--------------------------------------------
 
 .. automodule:: pyams_utils.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_utils/pyams_utils.timezone.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.timezone.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_utils.timezone:
 
-pyams_utils.timezone package
-============================
+\ :mod:`pyams_utils.timezone` package
+=====================================
 
 .. automodule:: pyams_utils.timezone
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.timezone\.utility module
---------------------------------------
+pyams_utils.timezone.\ ``utility``
+----------------------------------
 
 .. automodule:: pyams_utils.timezone.utility
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.timezone\.vocabulary module
------------------------------------------
+pyams_utils.timezone.\ ``vocabulary``
+-------------------------------------
 
 .. automodule:: pyams_utils.timezone.vocabulary
     :members:
--- a/src/source/pyams_utils/pyams_utils.widget.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.widget.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_utils.widget:
 
-pyams_utils.widget package
-==========================
+\ :mod:`pyams_utils.widget` package
+===================================
 
 .. automodule:: pyams_utils.widget
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.widget\.decimal module
-------------------------------------
+pyams_utils.widget.\ ``decimal``
+--------------------------------
 
 .. automodule:: pyams_utils.widget.decimal
     :members:
--- a/src/source/pyams_utils/pyams_utils.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_utils.zmi:
 
-pyams_utils.zmi package
-=======================
+\ :mod:`pyams_utils.zmi` package
+================================
 
 .. automodule:: pyams_utils.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_utils\.zmi\.intids module
---------------------------------
+pyams_utils.zmi.\ ``intids``
+----------------------------
 
 .. automodule:: pyams_utils.zmi.intids
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.zmi\.timezone module
-----------------------------------
+pyams_utils.zmi.\ ``timezone``
+------------------------------
 
 .. automodule:: pyams_utils.zmi.timezone
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.zmi\.zeo module
------------------------------
+pyams_utils.zmi.\ ``zeo``
+-------------------------
 
 .. automodule:: pyams_utils.zmi.zeo
     :members:
--- a/src/source/pyams_viewlet/pyams_viewlet.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_viewlet/pyams_viewlet.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_viewlet.interfaces:
 
-pyams_viewlet.interfaces package
-================================
+\ :mod:`pyams_viewlet.interfaces` package
+=========================================
 
 .. automodule:: pyams_viewlet.interfaces
     :members:
--- a/src/source/pyams_viewlet/pyams_viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_viewlet/pyams_viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_viewlet:
 
-pyams_viewlet package
-=====================
+\ :mod:`pyams_viewlet` package
+==============================
 
 .. automodule:: pyams_viewlet
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_viewlet\.manager module
-------------------------------
+pyams_viewlet.\ ``manager``
+---------------------------
 
 .. automodule:: pyams_viewlet.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_viewlet\.metaconfigure module
-------------------------------------
+pyams_viewlet.\ ``metaconfigure``
+---------------------------------
 
 .. automodule:: pyams_viewlet.metaconfigure
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_viewlet\.metadirectives module
--------------------------------------
+pyams_viewlet.\ ``metadirectives``
+----------------------------------
 
 .. automodule:: pyams_viewlet.metadirectives
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_viewlet\.provider module
--------------------------------
+pyams_viewlet.\ ``provider``
+----------------------------
 
 .. automodule:: pyams_viewlet.provider
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_viewlet\.viewlet module
-------------------------------
+pyams_viewlet.\ ``viewlet``
+---------------------------
 
 .. automodule:: pyams_viewlet.viewlet
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_viewlet/pyams_viewlet.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_viewlet/pyams_viewlet.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_viewlet.tests:
 
-pyams_viewlet.tests package
-===========================
+\ :mod:`pyams_viewlet.tests` package
+====================================
 
 .. automodule:: pyams_viewlet.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_viewlet\.tests\.test\_utilsdocs module
----------------------------------------------
+pyams_viewlet.tests.\ ``test_utilsdocs``
+----------------------------------------
 
 .. automodule:: pyams_viewlet.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_viewlet\.tests\.test\_utilsdocstrings module
----------------------------------------------------
+pyams_viewlet.tests.\ ``test_utilsdocstrings``
+----------------------------------------------
 
 .. automodule:: pyams_viewlet.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_workflow/pyams_workflow.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_workflow/pyams_workflow.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_workflow.interfaces:
 
-pyams_workflow.interfaces package
-=================================
+\ :mod:`pyams_workflow.interfaces` package
+==========================================
 
 .. automodule:: pyams_workflow.interfaces
     :members:
--- a/src/source/pyams_workflow/pyams_workflow.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_workflow/pyams_workflow.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,42 +1,39 @@
 .. _pyams_workflow:
 
-pyams_workflow package
-======================
+\ :mod:`pyams_workflow` package
+===============================
 
 .. automodule:: pyams_workflow
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_workflow\.content module
--------------------------------
+pyams_workflow.\ ``content``
+----------------------------
 
 .. automodule:: pyams_workflow.content
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.include module
--------------------------------
+pyams_workflow.\ ``include``
+----------------------------
 
 .. automodule:: pyams_workflow.include
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.versions module
---------------------------------
+pyams_workflow.\ ``versions``
+-----------------------------
 
 .. automodule:: pyams_workflow.versions
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.workflow module
---------------------------------
+pyams_workflow.\ ``workflow``
+-----------------------------
 
 .. automodule:: pyams_workflow.workflow
     :members:
@@ -45,7 +42,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_workflow/pyams_workflow.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_workflow/pyams_workflow.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_workflow.tests:
 
-pyams_workflow.tests package
-============================
+\ :mod:`pyams_workflow.tests` package
+=====================================
 
 .. automodule:: pyams_workflow.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_workflow\.tests\.test\_utilsdocs module
-----------------------------------------------
+pyams_workflow.tests.\ ``test_utilsdocs``
+-----------------------------------------
 
 .. automodule:: pyams_workflow.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.tests\.test\_utilsdocstrings module
-----------------------------------------------------
+pyams_workflow.tests.\ ``test_utilsdocstrings``
+-----------------------------------------------
 
 .. automodule:: pyams_workflow.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_workflow/pyams_workflow.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_workflow/pyams_workflow.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_workflow.zmi:
 
-pyams_workflow.zmi package
-==========================
+\ :mod:`pyams_workflow.zmi` package
+===================================
 
 .. automodule:: pyams_workflow.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_workflow\.zmi\.interfaces module
----------------------------------------
+pyams_workflow.zmi.\ ``interfaces``
+-----------------------------------
 
 .. automodule:: pyams_workflow.zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.zmi\.transition module
----------------------------------------
+pyams_workflow.zmi.\ ``transition``
+-----------------------------------
 
 .. automodule:: pyams_workflow.zmi.transition
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.zmi\.versions module
--------------------------------------
+pyams_workflow.zmi.\ ``versions``
+---------------------------------
 
 .. automodule:: pyams_workflow.zmi.versions
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_workflow/pyams_workflow.zmi.viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_workflow/pyams_workflow.zmi.viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_workflow.zmi.viewlet:
 
-pyams_workflow.zmi.viewlet package
-==================================
+\ :mod:`pyams_workflow.zmi.viewlet` package
+===========================================
 
 .. automodule:: pyams_workflow.zmi.viewlet
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_workflow\.zmi\.viewlet\.transitions module
--------------------------------------------------
+pyams_workflow.zmi.viewlet.\ ``transitions``
+--------------------------------------------
 
 .. automodule:: pyams_workflow.zmi.viewlet.transitions
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_workflow\.zmi\.viewlet\.versions module
-----------------------------------------------
+pyams_workflow.zmi.viewlet.\ ``versions``
+-----------------------------------------
 
 .. automodule:: pyams_workflow.zmi.viewlet.versions
     :members:
--- a/src/source/pyams_zmi/pyams_zmi.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_zmi.interfaces:
 
-pyams_zmi.interfaces package
-============================
+\ :mod:`pyams_zmi.interfaces` package
+=====================================
 
 .. automodule:: pyams_zmi.interfaces
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmi\.interfaces\.menu module
------------------------------------
+pyams_zmi.interfaces.\ ``menu``
+-------------------------------
 
 .. automodule:: pyams_zmi.interfaces.menu
     :members:
--- a/src/source/pyams_zmi/pyams_zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,50 +1,47 @@
 .. _pyams_zmi:
 
-pyams_zmi package
-=================
+\ :mod:`pyams_zmi` package
+==========================
 
 .. automodule:: pyams_zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmi\.configuration module
---------------------------------
+pyams_zmi.\ ``configuration``
+-----------------------------
 
 .. automodule:: pyams_zmi.configuration
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.form module
------------------------
+pyams_zmi.\ ``form``
+--------------------
 
 .. automodule:: pyams_zmi.form
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.layer module
-------------------------
+pyams_zmi.\ ``layer``
+---------------------
 
 .. automodule:: pyams_zmi.layer
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.skin module
------------------------
+pyams_zmi.\ ``skin``
+--------------------
 
 .. automodule:: pyams_zmi.skin
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.view module
------------------------
+pyams_zmi.\ ``view``
+--------------------
 
 .. automodule:: pyams_zmi.view
     :members:
@@ -53,7 +50,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_zmi/pyams_zmi.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_zmi.tests:
 
-pyams_zmi.tests package
-=======================
+\ :mod:`pyams_zmi.tests` package
+================================
 
 .. automodule:: pyams_zmi.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmi\.tests\.test\_utilsdocs module
------------------------------------------
+pyams_zmi.tests.\ ``test_utilsdocs``
+------------------------------------
 
 .. automodule:: pyams_zmi.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.tests\.test\_utilsdocstrings module
------------------------------------------------
+pyams_zmi.tests.\ ``test_utilsdocstrings``
+------------------------------------------
 
 .. automodule:: pyams_zmi.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_zmi/pyams_zmi.viewlet.menu.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.viewlet.menu.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_zmi.viewlet.menu:
 
-pyams_zmi.viewlet.menu package
-==============================
+\ :mod:`pyams_zmi.viewlet.menu` package
+=======================================
 
 .. automodule:: pyams_zmi.viewlet.menu
     :members:
--- a/src/source/pyams_zmi/pyams_zmi.viewlet.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.viewlet.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_zmi.viewlet:
 
-pyams_zmi.viewlet package
-=========================
+\ :mod:`pyams_zmi.viewlet` package
+==================================
 
 .. automodule:: pyams_zmi.viewlet
     :members:
@@ -9,7 +9,7 @@
     :show-inheritance:
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_zmi/pyams_zmi.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmi/pyams_zmi.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,54 +1,59 @@
 .. _pyams_zmi.zmi:
 
-pyams_zmi.zmi package
-=====================
+\ :mod:`pyams_zmi.zmi` package
+==============================
 
 .. automodule:: pyams_zmi.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmi\.zmi\.control\_panel module
---------------------------------------
+pyams_zmi.zmi.\ ``control_panel``
+---------------------------------
 
 .. automodule:: pyams_zmi.zmi.control_panel
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.zmi\.extension module
----------------------------------
+pyams_zmi.zmi.\ ``extension``
+-----------------------------
 
 .. automodule:: pyams_zmi.zmi.extension
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.zmi\.index module
------------------------------
+pyams_zmi.zmi.\ ``index``
+-------------------------
 
 .. automodule:: pyams_zmi.zmi.index
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.zmi\.site module
-----------------------------
+pyams_zmi.zmi.\ ``site``
+------------------------
 
 .. automodule:: pyams_zmi.zmi.site
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmi\.zmi\.skin module
-----------------------------
+pyams_zmi.zmi.\ ``skin``
+------------------------
 
 .. automodule:: pyams_zmi.zmi.skin
     :members:
     :undoc-members:
     :show-inheritance:
 
+pyams_zmi.zmi.\ ``table``
+-------------------------
 
+.. automodule:: pyams_zmi.zmi.table
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
--- a/src/source/pyams_zmq/pyams_zmq.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmq/pyams_zmq.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_zmq.interfaces:
 
-pyams_zmq.interfaces package
-============================
+\ :mod:`pyams_zmq.interfaces` package
+=====================================
 
 .. automodule:: pyams_zmq.interfaces
     :members:
--- a/src/source/pyams_zmq/pyams_zmq.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmq/pyams_zmq.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,34 +1,31 @@
 .. _pyams_zmq:
 
-pyams_zmq package
-=================
+\ :mod:`pyams_zmq` package
+==========================
 
 .. automodule:: pyams_zmq
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmq\.handler module
---------------------------
+pyams_zmq.\ ``handler``
+-----------------------
 
 .. automodule:: pyams_zmq.handler
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmq\.process module
---------------------------
+pyams_zmq.\ ``process``
+-----------------------
 
 .. automodule:: pyams_zmq.process
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmq\.socket module
--------------------------
+pyams_zmq.\ ``socket``
+----------------------
 
 .. automodule:: pyams_zmq.socket
     :members:
@@ -37,7 +34,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_zmq/pyams_zmq.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zmq/pyams_zmq.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_zmq.tests:
 
-pyams_zmq.tests package
-=======================
+\ :mod:`pyams_zmq.tests` package
+================================
 
 .. automodule:: pyams_zmq.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zmq\.tests\.test\_utilsdocs module
------------------------------------------
+pyams_zmq.tests.\ ``test_utilsdocs``
+------------------------------------
 
 .. automodule:: pyams_zmq.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zmq\.tests\.test\_utilsdocstrings module
------------------------------------------------
+pyams_zmq.tests.\ ``test_utilsdocstrings``
+------------------------------------------
 
 .. automodule:: pyams_zmq.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_zodbbrowser/pyams_zodbbrowser.interfaces.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zodbbrowser/pyams_zodbbrowser.interfaces.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,7 +1,7 @@
 .. _pyams_zodbbrowser.interfaces:
 
-pyams_zodbbrowser.interfaces package
-====================================
+\ :mod:`pyams_zodbbrowser.interfaces` package
+=============================================
 
 .. automodule:: pyams_zodbbrowser.interfaces
     :members:
--- a/src/source/pyams_zodbbrowser/pyams_zodbbrowser.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zodbbrowser/pyams_zodbbrowser.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,58 +1,55 @@
 .. _pyams_zodbbrowser:
 
-pyams_zodbbrowser package
-=========================
+\ :mod:`pyams_zodbbrowser` package
+==================================
 
 .. automodule:: pyams_zodbbrowser
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zodbbrowser\.btreesupport module
----------------------------------------
+pyams_zodbbrowser.\ ``btreesupport``
+------------------------------------
 
 .. automodule:: pyams_zodbbrowser.btreesupport
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.cache module
---------------------------------
+pyams_zodbbrowser.\ ``cache``
+-----------------------------
 
 .. automodule:: pyams_zodbbrowser.cache
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.diff module
--------------------------------
+pyams_zodbbrowser.\ ``diff``
+----------------------------
 
 .. automodule:: pyams_zodbbrowser.diff
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.history module
-----------------------------------
+pyams_zodbbrowser.\ ``history``
+-------------------------------
 
 .. automodule:: pyams_zodbbrowser.history
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.state module
---------------------------------
+pyams_zodbbrowser.\ ``state``
+-----------------------------
 
 .. automodule:: pyams_zodbbrowser.state
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.value module
---------------------------------
+pyams_zodbbrowser.\ ``value``
+-----------------------------
 
 .. automodule:: pyams_zodbbrowser.value
     :members:
@@ -61,7 +58,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::
 
--- a/src/source/pyams_zodbbrowser/pyams_zodbbrowser.tests.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zodbbrowser/pyams_zodbbrowser.tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,26 +1,23 @@
 .. _pyams_zodbbrowser.tests:
 
-pyams_zodbbrowser.tests package
-===============================
+\ :mod:`pyams_zodbbrowser.tests` package
+========================================
 
 .. automodule:: pyams_zodbbrowser.tests
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zodbbrowser\.tests\.test\_utilsdocs module
--------------------------------------------------
+pyams_zodbbrowser.tests.\ ``test_utilsdocs``
+--------------------------------------------
 
 .. automodule:: pyams_zodbbrowser.tests.test_utilsdocs
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_zodbbrowser\.tests\.test\_utilsdocstrings module
--------------------------------------------------------
+pyams_zodbbrowser.tests.\ ``test_utilsdocstrings``
+--------------------------------------------------
 
 .. automodule:: pyams_zodbbrowser.tests.test_utilsdocstrings
     :members:
--- a/src/source/pyams_zodbbrowser/pyams_zodbbrowser.zmi.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/pyams_zodbbrowser/pyams_zodbbrowser.zmi.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,18 +1,15 @@
 .. _pyams_zodbbrowser.zmi:
 
-pyams_zodbbrowser.zmi package
-=============================
+\ :mod:`pyams_zodbbrowser.zmi` package
+======================================
 
 .. automodule:: pyams_zodbbrowser.zmi
     :members:
     :undoc-members:
     :show-inheritance:
 
-Submodules
-++++++++++
-
-pyams\_zodbbrowser\.zmi\.views module
--------------------------------------
+pyams_zodbbrowser.zmi.\ ``views``
+---------------------------------
 
 .. automodule:: pyams_zodbbrowser.zmi.views
     :members:
--- a/src/source/quickstart.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/quickstart.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -240,7 +240,7 @@
 
 .. tip::
 
-    See :ref:`appinstall` to get more detailed information about installation process.
+    See :ref:`install` to get more detailed information about installation process.
 
 
 After *buildout*, just check INI files in *etc* directory (see :ref:`config`)
@@ -273,13 +273,13 @@
 
 Launch a browser and open URL http://127.0.0.1:6543/admin to get access to PyAMS management interface.
 
+.. image:: _static/pyams-login.png
 
 .. warning::
 
     By default:
 
     - Login: admin
-
     - Password: admin
 
     **You must change it as soon as possible!**
--- a/src/source/scripts.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/scripts.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -3,3 +3,42 @@
 PyAMS maintenance scripts
 =========================
 
+
+pyams_upgrade
+-------------
+
+
+Pyramid allows to define custom command line scripts for application management. A script called *pyams_upgrade* is
+provided by PyAMS_utils package; this script apply the same process as PyAMS site factory, but can also be used to
+manage **database generations**. The idea behind this is just to allow custom packages to provide a way to check and
+upgrade database configuration away from application startup process:
+
+.. code-block:: bash
+
+    # ./bin/pyams_upgrade webapp/development.ini
+
+
+A **site generation checker** is just a named utility providing :py:class:`pyams_utils.interfaces.site.ISiteGenerations`
+interface. For example, **pyams_security** package provides such utility, to make sure that local site manager
+contains a PyAMS security manager and a principal annotation utility:
+
+.. code-block:: python
+
+    from pyams_utils.site import check_required_utilities
+
+    REQUIRED_UTILITIES = ((ISecurityManager, '', SecurityManager, 'Security manager'),
+                          (IPrincipalAnnotationUtility, '', PrincipalAnnotationUtility, 'User profiles'))
+
+    @utility_config(name='PyAMS security', provides=ISiteGenerations)
+    class SecurityGenerationsChecker(object):
+    """I18n generations checker"""
+
+        generation = 1
+
+        def evolve(self, site, current=None):
+            """Check for required utilities"""
+            check_required_utilities(site, REQUIRED_UTILITIES)
+
+:py:func:`check_required_utilities <pyams_utils.site.check_required_utilities>` is a PyAMS_utils utility function which
+can to used to verify that a set of local utilities are correctly registered with the given names and interfaces.
+
--- a/src/source/site.rst	Thu Apr 12 11:18:48 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-.. _site:
-
-PyAMS site management
-=====================
-
-PyAMS site management is based on the ZODB.
-
-On application startup, if PyAMS_utils package is included into Pyramid configuration, several operations take
-place:
-
- - a custom **site factory** is defined
-
- - custom request methods are defined
-
- - a custom **traverser** handling **namespaces** is defined
-
- - a custom subscribers predicate based on interfaces support is defined
-
- - several adapters are registered, to handle annotations and key references
-
- - custom TALES extensions are registered.
-
-The site factory is an important component in this process. It is this factory which will define the application root
-and create a **local site manager**.
-
-Pyramid application is loaded from ZODB's root via a key defined in Pyramid's configuration file; the key is named
-*pyams.application_name* and it's default value is *application*.
-
-If the application can't be found, PyAMS is looking for an application class name in Pyramid's configuration file; the
-class name configuration key is called *pyams.application_factory* and defined by default as
-*pyams_utils.site.BaseSiteRoot*. PyAMS default site factory will then create the application, and add a local site
-manager to it (see :ref:`zca`).
-
-After application creation, a :py:class:`NewLocalSiteCreatedEvent <pyams_utils.site.NewLocalSiteCreatedEvent>` is
-notified. Custom packages can subscribe to this event to register custom components.
-
-
-*pyams_upgrade* command line script
------------------------------------
-
-Pyramid allows to define custom command line scripts for application management. A script called *pyams_upgrade* is
-provided by PyAMS_utils package; this script apply the same process as PyAMS site factory, but can also be used to
-manage **database generations**. The idea behind this is just to allow custom packages to provide a way to check and
-upgrade database configuration away from application startup process:
-
-.. code-block:: bash
-
-    # ./bin/pyams_upgrade webapp/development.ini
-
-
-A **site generation checker** is just a named utility providing :py:class:`pyams_utils.interfaces.site.ISiteGenerations`
-interface. For example, **pyams_security** package provides such utility, to make sure that local site manager
-contains a PyAMS security manager and a principal annotation utility:
-
-.. code-block:: python
-
-    from pyams_utils.site import check_required_utilities
-
-    REQUIRED_UTILITIES = ((ISecurityManager, '', SecurityManager, 'Security manager'),
-                          (IPrincipalAnnotationUtility, '', PrincipalAnnotationUtility, 'User profiles'))
-
-    @utility_config(name='PyAMS security', provides=ISiteGenerations)
-    class SecurityGenerationsChecker(object):
-    """I18n generations checker"""
-
-        generation = 1
-
-        def evolve(self, site, current=None):
-            """Check for required utilities"""
-            check_required_utilities(site, REQUIRED_UTILITIES)
-
-:py:func:`check_required_utilities <pyams_utils.site.check_required_utilities>` is a PyAMS_utils utility function which
-can to used to verify that a set of local utilities are correctly registered with the given names and interfaces.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/tests.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,35 @@
+.. _tests:
+
+PyAMS tests
+===========
+
+.. toctree::
+   :maxdepth: 1
+
+   PyAMS Alchemy tests <pyams_alchemy/pyams_alchemy.tests.rst>
+   PyAMS Cache tests <pyams_cache/pyams_cache.tests.rst>
+   PyAMS Catalog tests <pyams_catalog/pyams_catalog.tests.rst>
+   PyAMS Content tests <pyams_content/pyams_content.tests.rst>
+   PyAMS Content_es tests <pyams_content_es/pyams_content_es.tests.rst>
+   PyAMS File tests <pyams_file/pyams_file.tests.rst>
+   PyAMS Form tests <pyams_form/pyams_form.tests.rst>
+   PyAMS GIS tests <pyams_gis/pyams_gis.tests.rst>
+   PyAMS I18N tests <pyams_i18n/pyams_i18n.tests.rst>
+   PyAMS LDAP tests <pyams_ldap/pyams_ldap.tests.rst>
+   PyAMS Mail tests <pyams_mail/pyams_mail.tests.rst>
+   PyAMS Media tests <pyams_media/pyams_media.tests.rst>
+   PyAMS Notify tests <pyams_notify/pyams_notify.tests.rst>
+   PyAMS Pagelet tests <pyams_pagelet/pyams_pagelet.tests.rst>
+   PyAMS Portal tests <pyams_portal/pyams_portal.tests.rst>
+   PyAMS Scheduler tests <pyams_scheduler/pyams_scheduler.tests.rst>
+   PyAMS Security tests <pyams_security/pyams_security.tests.rst>
+   PyAMS Sequence tests <pyams_sequence/pyams_sequence.tests.rst>
+   PyAMS Skin tests <pyams_skin/pyams_skin.tests.rst>
+   PyAMS Template tests <pyams_template/pyams_template.tests.rst>
+   PyAMS Thesaurus tests <pyams_thesaurus/pyams_thesaurus.tests.rst>
+   PyAMS Utils tests <pyams_utils/pyams_utils.tests.rst>
+   PyAMS Viewlet tests <pyams_viewlet/pyams_viewlet.tests.rst>
+   PyAMS Workflow tests <pyams_workflow/pyams_workflow.tests.rst>
+   PyAMS ZMI tests <pyams_zmi/pyams_zmi.tests.rst>
+   PyAMS ZMQ tests <pyams_zmq/pyams_zmq.tests.rst>
+   PyAMS ZODBbrowser tests <pyams_zodbbrowser/pyams_zodbbrowser.tests.rst>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/source/userguide.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -0,0 +1,23 @@
+.. _userguide:
+
+PyAMS User's Guide
+==================
+
+Creating content
+----------------
+
+How to create a Site
+''''''''''''''''''''
+
+How to create a Modele
+''''''''''''''''''''''
+
+How to create a News
+''''''''''''''''''''
+
+How to create a Topic
+'''''''''''''''''''''
+
+
+Publishing content
+------------------
--- a/src/source/zca.rst	Thu Apr 12 11:18:48 2018 +0200
+++ b/src/source/zca.rst	Fri Apr 27 14:44:33 2018 +0200
@@ -1,65 +1,63 @@
 .. _zca:
 
-Managing ZCA with PyAMS
-=======================
+Zope Component Architecture with PyAMS
+++++++++++++++++++++++++++++++++++++++
 
-The **Zope Component Architecture** (aka ZCA) is used by the Pyramid framework "under the hood" to handle interfaces,
+The **Zope Component Architecture** (aka **ZCA**) is used by the Pyramid framework "under the hood" to handle interfaces,
 adapters and utilities. You don't **have to** use it in your own applications. But you can.
 
 The ZCA is mainly adding elements like **interfaces**, **adapters** and **utilities** to the Python language. It
 allows you to write a framework or an application by using **components** which can be extended easily.
 
-You will find several useful resources about ZCA concepts on the internet.
+Interfaces
+    Interfaces are objects that specify (document) the external behavior
+    of objects that "provide" them.  An interface specifies behavior through, a documentation in a doc string,
+    attribute definitions and conditions of attribute values.
+
+Components
+    Components are objects that are associated with interfaces.
+
+Utilities
+    Utilities are just components that provide an interface and that are looked up by an interface and a name
+
+Adapters
+    Adapters are components that are computed from other components to adapt them to some interface.
+    Because they are computed from other objects, they are provided as factories, usually classes.
 
 
+You will find several useful resources about ZCA concepts on the internet.
+
+.. seealso::
+    Zope Documentations:
+        - `Components and Interfaces <http://zope.readthedocs.io/en/latest/zdgbook/ComponentsAndInterfaces.html>`_
+        - `Zope component <http://zopecomponent.readthedocs.io/en/latest/narr.html>`_
+        - `Zope interface <https://docs.zope.org/zope.interface/README.html>`_
+
+
+Utilities
+---------
+
 Local utilities
----------------
+'''''''''''''''
 
 In ZCA, a **utility** is a **registered** component which provides an **interface**. This interface is the
 **contract** which defines features (list of attributes and methods) provided by the component which implements it.
 
 When a Pyramid application starts, a **global registry** is created to register a whole set of utilities and
 adapters; this registration can be done via ZCML directives or via native Python code.
-In addition, PyAMS allows you to define **local utilities**, which are stored and registered in the ZODB via a **site
-manager**.
-
-
-Defining site root
-------------------
-
-One of PyAMS pre-requisites is to use the ZODB, at least to store the site root application, it's configuration and a
-set of local utilities. :ref:`site` describes application startup and **local site manager** initialization process.
-
-This site can be used to store **local utilities** whose configuration, which is easily available to site
-administrators through management interface, is stored in the ZODB.
-
-
-Registering global utilities
-----------------------------
-
-**Global utilities** are components providing an interface which are registered in the global registry.
-PyAMS_utils package provides custom annotations to register global utilities without using ZCML. For example, a skin
-is nothing more than a simple utility providing the *ISkin* interface:
-
-.. code-block:: python
-
-    from pyams_default_theme.layer import IPyAMSDefaultLayer
-    from pyams_skin.interfaces import ISkin
-    from pyams_utils.registry import utility_config
-
-    @utility_config(name='PyAMS default skin', provides=ISkin)
-    class PyAMSDefaultSkin(object):
-        """PyAMS default skin"""
-
-        label = _("PyAMS default skin")
-        layer = IPyAMSDefaultLayer
-
-This annotation registers a utility, named *PyAMS default skin*, providing the *ISkin* interface. It's the developer
-responsibility to provide all attributes and methods required by the provided interface.
+In addition, PyAMS allows you to define **local utilities**, which are stored and registered in the ZODB via a
+**site manager**.
 
 
 Registering local utilities
----------------------------
+'''''''''''''''''''''''''''
+
+
+.. tip::
+
+    :ref:`site` can be used to store **local utilities** whose configuration, which is easily
+    available to site administrators through management interface, is stored in the ZODB.
+
 
 A local utility is a persistent object, registered in a *local site manager*, and providing a specific interface (if
 a component provides several interfaces, it can be registered several times).
@@ -143,8 +141,32 @@
 by an event is providing given interface.
 
 
+Registering global utilities
+''''''''''''''''''''''''''''
+
+**Global utilities** are components providing an interface which are registered in the global registry.
+PyAMS_utils package provides custom annotations to register global utilities without using ZCML. For example, a skin
+is nothing more than a simple utility providing the *ISkin* interface:
+
+.. code-block:: python
+
+    from pyams_default_theme.layer import IPyAMSDefaultLayer
+    from pyams_skin.interfaces import ISkin
+    from pyams_utils.registry import utility_config
+
+    @utility_config(name='PyAMS default skin', provides=ISkin)
+    class PyAMSDefaultSkin(object):
+        """PyAMS default skin"""
+
+        label = _("PyAMS default skin")
+        layer = IPyAMSDefaultLayer
+
+This annotation registers a utility, named *PyAMS default skin*, providing the *ISkin* interface. It's the developer
+responsibility to provide all attributes and methods required by the provided interface.
+
+
 Looking for utilities
----------------------
+'''''''''''''''''''''
 
 ZCA provides the *getUtility* and *queryUtility* functions to look for a utility. But these methods only applies to
 global registry.
@@ -166,8 +188,11 @@
 functions API, but are looking for utilities in the local registry before looking in the global registry.
 
 
+Adapters
+--------
+
 Registering adapters
---------------------
+''''''''''''''''''''
 
 An adapter is also a kind of utility. But instead of *just* providing an interface, it adapts an input object,
 providing a given interface, to provide another interface. An adapter can also be named, so that you can choose which
@@ -241,8 +266,11 @@
 As you can see, adapted objects can be given as functions or as classes.
 
 
+Vocabularies
+------------
+
 Registering vocabularies
-------------------------
+''''''''''''''''''''''''
 
 A **vocabulary** is a custom factory which can be used as source for several field types, like *choices* or *lists*.
 Vocabularies have to be registered in a custom registry, so PyAMS_utils provide another annotation to register them.
@@ -261,3 +289,7 @@
         def __init__(self, *args, **kw):
             terms = [SimpleTerm(t, t, t) for t in pytz.all_timezones]
             super(TimezonesVocabulary, self).__init__(terms)
+
+
+
+