--- a/src/source/pyams_utils/pyams_utils.rst	Fri Apr 20 16:52:49 2018 +0200
+++ b/src/source/pyams_utils/pyams_utils.rst	Fri Apr 27 11:51:08 2018 +0200
@@ -1,282 +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\.cache module
---------------------------
+pyams_utils.\ ``cache``
+-----------------------
 
 .. automodule:: pyams_utils.cache
     :members:
     :undoc-members:
     :show-inheritance:
 
-pyams\_utils\.container module
-------------------------------
+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:
@@ -285,7 +282,7 @@
 
 
 Subpackages
-+++++++++++
+-----------
 
 .. toctree::