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