--- a/src/source/index.rst	Tue Dec 11 17:00:42 2018 +0100
+++ b/src/source/index.rst	Thu Dec 13 10:51:53 2018 +0100
@@ -20,6 +20,8 @@
 
    Overview <overview>
    Quickstart <quickstart>
+   Glossary <glossary>
+
 
 .. toctree::
    :maxdepth: 2
@@ -27,13 +29,13 @@
 
    PyAMS Architectures <admin_guide/architecture>
    PyAMS Security model <admin_guide/security>
-   Installing PyAMS <admin_guide/appinstall>
-   Database initialization <admin_guide/appinstall>
-   Database maintenance tasks
-   Scheduling tasks
-   Command line scripts
-   Application tuning
-   Troubleshooting
+   Installing PyAMS <admin_guide/pyams-install>
+   Database initialization <admin_guide/zodb-init>
+   Database maintenance tasks <admin_guide/zodb-support>
+   Scheduling tasks <admin_guide/tasks>
+   Command line scripts <admin_guide/scripts>
+   Application tuning <admin_guide/app-tuning>
+   Troubleshooting <admin_guide/troubleshooting>
 
    Configuring and Running PyAMS <app>
    Managing PyAMS environment <manage>