--- a/src/source/pyams_security/pyams_security.rst	Fri Apr 20 16:52:49 2018 +0200
+++ b/src/source/pyams_security/pyams_security.rst	Fri Apr 27 11:51:08 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::