diff -r 6ed429390935 -r 5ebe61e3a965 src/source/pyams_i18n/pyams_i18n.rst
--- a/src/source/pyams_i18n/pyams_i18n.rst	Fri Apr 20 16:52:49 2018 +0200
+++ b/src/source/pyams_i18n/pyams_i18n.rst	Fri Apr 27 11:51:08 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::