--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/PyAMS User Guide.mm	Mon Dec 10 14:14:57 2018 +0100
@@ -0,0 +1,215 @@
+<map version="0.9.0">
+<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
+<node CREATED="1544082526024" ID="ID_189546942" MODIFIED="1544082547685" TEXT="PyAMS User Guide">
+<node CREATED="1544114304085" ID="ID_1677089388" MODIFIED="1544114307732" POSITION="right" TEXT="Overview">
+<node CREATED="1544114332902" ID="ID_1745590765" MODIFIED="1544114349037" TEXT="What is PyAMS?"/>
+<node CREATED="1544114358279" ID="ID_1650380321" MODIFIED="1544114795665" TEXT="Default theme gallery"/>
+<node CREATED="1544114816698" ID="ID_473600512" MODIFIED="1544114836057" TEXT="Alternate skins gallery"/>
+<node CREATED="1544114375663" ID="ID_319992367" MODIFIED="1544114809417" TEXT="ZMI screenshots"/>
+</node>
+<node CREATED="1544082588539" ID="ID_1258234978" MODIFIED="1544082595232" POSITION="right" TEXT="Quickstart">
+<node CREATED="1544083111961" ID="ID_1813481152" MODIFIED="1544083116982" TEXT="Introduction"/>
+<node CREATED="1544083097824" ID="ID_1957237339" MODIFIED="1544083103373" TEXT="Quick install">
+<node CREATED="1544083136689" ID="ID_746908139" MODIFIED="1544083154031" TEXT="Requirements"/>
+<node CREATED="1544083156946" ID="ID_300063192" MODIFIED="1544096818607" TEXT="Creating database"/>
+<node CREATED="1544083165498" ID="ID_29656789" MODIFIED="1544083174447" TEXT="Creating application instance"/>
+<node CREATED="1544083175562" ID="ID_1666701342" MODIFIED="1544083183375" TEXT="Updating main settings"/>
+<node CREATED="1544083186475" ID="ID_1511305066" MODIFIED="1544083193616" TEXT="Initializing the database"/>
+<node CREATED="1544083194675" ID="ID_1526175538" MODIFIED="1544083201312" TEXT="Starting the application"/>
+</node>
+</node>
+<node CREATED="1544114311158" ID="ID_1908179630" MODIFIED="1544114539695" POSITION="right" TEXT="Glossary">
+<node CREATED="1544114448681" ID="ID_1887803218" MODIFIED="1544114476873" TEXT="Front-office"/>
+<node CREATED="1544114454617" ID="ID_135247108" MODIFIED="1544114473112" TEXT="Back-office"/>
+<node CREATED="1544114393928" ID="ID_44676408" MODIFIED="1544114400710" TEXT="Administrator"/>
+<node CREATED="1544114404368" ID="ID_241771111" MODIFIED="1544114407486" TEXT="Site manager"/>
+<node CREATED="1544114408096" ID="ID_1425535301" MODIFIED="1544114411334" TEXT="Webmaster"/>
+<node CREATED="1544114412208" ID="ID_1995811451" MODIFIED="1544114424407" TEXT="Manager"/>
+<node CREATED="1544114426920" ID="ID_724615252" MODIFIED="1544114431095" TEXT="Contributor"/>
+<node CREATED="1544114431865" ID="ID_1826239127" MODIFIED="1544114435199" TEXT="Reader"/>
+<node CREATED="1544114440145" ID="ID_1160180332" MODIFIED="1544114445090" TEXT="Developer"/>
+<node CREATED="1544114461609" ID="ID_1555563462" MODIFIED="1544114464112" TEXT="Visitor"/>
+<node CREATED="1544115006047" ID="ID_363984079" MODIFIED="1544115009630" TEXT="Permission"/>
+<node CREATED="1544115010631" ID="ID_1778862434" MODIFIED="1544115013734" TEXT="Role"/>
+<node CREATED="1544115016095" ID="ID_1495768574" MODIFIED="1544115020384" TEXT="Principal"/>
+<node CREATED="1544114542475" ID="ID_424880725" MODIFIED="1544114545090" TEXT="Site"/>
+<node CREATED="1544114553020" ID="ID_672218092" MODIFIED="1544114555618" TEXT="Blog"/>
+<node CREATED="1544114533971" ID="ID_1375963240" MODIFIED="1544114537722" TEXT="Content"/>
+<node CREATED="1544114737105" ID="ID_1925463239" MODIFIED="1544114740055" TEXT="Workflow"/>
+<node CREATED="1544114514315" ID="ID_485077314" MODIFIED="1544114529402" TEXT="Presentation template"/>
+<node CREATED="1544115790602" ID="ID_354532573" MODIFIED="1544115794066" TEXT="Renderer"/>
+<node CREATED="1544114484394" ID="ID_1712631162" MODIFIED="1544114490027" TEXT="Portlet"/>
+<node CREATED="1544114490970" ID="ID_1790874874" MODIFIED="1544115809435" TEXT="Content block or &quot;paragraph&quot;"/>
+</node>
+<node CREATED="1544082562539" ID="ID_1317377807" MODIFIED="1544114580406" POSITION="right" TEXT="Administrator Guide">
+<node CREATED="1544082687526" ID="ID_1944252491" MODIFIED="1544082696875" TEXT="PyAMS architectures">
+<node CREATED="1544114919997" ID="ID_917431970" MODIFIED="1544114983013" TEXT="Development environment"/>
+<node CREATED="1544114932013" ID="ID_83639554" MODIFIED="1544114938092" TEXT="Single server mode"/>
+<node CREATED="1544114940165" ID="ID_1882861482" MODIFIED="1544114958460" TEXT="Advanced modes"/>
+</node>
+<node CREATED="1544096668637" ID="ID_1453995343" MODIFIED="1544096673443" TEXT="PyAMS security model"/>
+<node CREATED="1544114580396" ID="ID_600481294" MODIFIED="1544114587403" TEXT="Installing PyAMS">
+<node CREATED="1544082704454" ID="ID_393475506" MODIFIED="1544096802758" TEXT="Installing database">
+<node CREATED="1544116014704" ID="ID_280841378" MODIFIED="1544116017704" TEXT="ZEO"/>
+<node CREATED="1544116019440" ID="ID_1037252456" MODIFIED="1544116023704" TEXT="RelStorage"/>
+<node CREATED="1544116024424" ID="ID_129460905" MODIFIED="1544116029048" TEXT="Newt.DB"/>
+</node>
+<node CREATED="1544082724031" ID="ID_1384218316" MODIFIED="1544082731580" TEXT="Installing PyAMS">
+<node CREATED="1544097380078" ID="ID_858371682" MODIFIED="1544097394333" TEXT="Defining PyAMS settings"/>
+<node CREATED="1544096844241" ID="ID_397074531" MODIFIED="1544096853887" TEXT="Development mode"/>
+<node CREATED="1544096855370" ID="ID_645229711" MODIFIED="1544096863496" TEXT="Production mode"/>
+</node>
+<node CREATED="1544082734687" ID="ID_1507540371" MODIFIED="1544114904091" TEXT="Installing PyAMS notifications service"/>
+<node CREATED="1544085029641" ID="ID_1538607166" MODIFIED="1544098176401" TEXT="Installing custom extensions">
+<node CREATED="1544085153029" ID="ID_45483344" MODIFIED="1544085159218" TEXT="Redis / Memcached"/>
+<node CREATED="1544085194445" ID="ID_54369701" MODIFIED="1544098127115" TEXT="NLTK"/>
+<node CREATED="1544085160101" ID="ID_229883271" MODIFIED="1544085165474" TEXT="Elasticsearch"/>
+<node CREATED="1544085166477" ID="ID_811930944" MODIFIED="1544096915105" TEXT="APM"/>
+</node>
+</node>
+<node CREATED="1544097236035" ID="ID_37017716" MODIFIED="1544097249161" TEXT="Database initialization"/>
+<node CREATED="1544114633173" ID="ID_582315498" MODIFIED="1544114659565" TEXT="Database maintenance tasks"/>
+<node CREATED="1544096638004" ID="ID_33554959" MODIFIED="1544098156770" TEXT="Scheduling tasks"/>
+<node CREATED="1544085008041" ID="ID_1254647164" MODIFIED="1544098153616" TEXT="Command line scripts"/>
+<node CREATED="1544115972174" ID="ID_951072362" MODIFIED="1544115977671" TEXT="Application tuning"/>
+<node CREATED="1544088546938" ID="ID_1099962905" MODIFIED="1544088553048" TEXT="Troubleshooting"/>
+</node>
+<node CREATED="1544082554180" ID="ID_846144814" MODIFIED="1544082561471" POSITION="right" TEXT="User Guide">
+<node CREATED="1544087361892" ID="ID_1839350797" MODIFIED="1544096944642" TEXT="Management interface">
+<node CREATED="1544088507321" ID="ID_1992091996" MODIFIED="1544088515143" TEXT="Screenshots"/>
+<node CREATED="1544096415087" ID="ID_736873898" MODIFIED="1544096432013" TEXT="PyAMS management interface"/>
+</node>
+<node CREATED="1544082658109" ID="ID_1579411091" MODIFIED="1544082672954" TEXT="Site Manager Guide">
+<node CREATED="1544086215360" ID="ID_1226402471" MODIFIED="1544098040520" TEXT="After install...">
+<node CREATED="1544087032316" ID="ID_263955668" MODIFIED="1544087045074" TEXT="Settings administrator&apos;s password"/>
+<node CREATED="1544086226608" ID="ID_1842535090" MODIFIED="1544086236053" TEXT="Setting server timezone"/>
+<node CREATED="1544086236656" ID="ID_1317376022" MODIFIED="1544086254822" TEXT="Setting site&apos;s language(s)"/>
+<node CREATED="1544086346675" ID="ID_334852672" MODIFIED="1544086353352" TEXT="Creating ZEO connection"/>
+<node CREATED="1544086356507" ID="ID_555114713" MODIFIED="1544086361136" TEXT="Planning tasks"/>
+</node>
+<node CREATED="1544098042535" ID="ID_393438493" MODIFIED="1544098048486" TEXT="Custom utilities"/>
+<node CREATED="1544087052524" ID="ID_1182698459" MODIFIED="1544087080163" TEXT="Defining security"/>
+<node CREATED="1544087083141" ID="ID_964273715" MODIFIED="1544087090771" TEXT="Assigning roles"/>
+<node CREATED="1544096695198" ID="ID_1494996573" MODIFIED="1544096702188" TEXT="Medias conversions"/>
+<node CREATED="1544097798409" ID="ID_1966756050" MODIFIED="1544097808423" TEXT="Google tools integration"/>
+<node CREATED="1544097833698" ID="ID_511029534" MODIFIED="1544097839560" TEXT="Generating sitemap"/>
+<node CREATED="1544097857242" ID="ID_367815843" MODIFIED="1544097862881" TEXT="Managing redirections"/>
+</node>
+<node CREATED="1544086410668" ID="ID_127858067" MODIFIED="1544086415842" TEXT="Webmaster guide">
+<node CREATED="1544086373612" HGAP="25" ID="ID_222009279" MODIFIED="1544086928959" TEXT="Organizing your site" VSHIFT="-6"/>
+<node CREATED="1544087094070" ID="ID_272263523" MODIFIED="1544087109496" TEXT="Assigning users roles"/>
+<node CREATED="1544096530890" ID="ID_522093721" MODIFIED="1544096616369" TEXT="Using views"/>
+<node CREATED="1544096617724" ID="ID_951142898" MODIFIED="1544096622602" TEXT="Using thesaurus"/>
+<node CREATED="1544086936378" ID="ID_155779781" MODIFIED="1544086954767" TEXT="Creating presentation templates"/>
+</node>
+<node CREATED="1544082674326" ID="ID_1187141204" MODIFIED="1544082681907" TEXT="Contributor Guide">
+<node CREATED="1544087344492" ID="ID_1946668779" MODIFIED="1544087349099" TEXT="First login"/>
+<node CREATED="1544086960610" ID="ID_1201703525" MODIFIED="1544086971264" TEXT="Creating your first content"/>
+<node CREATED="1544097870187" ID="ID_48565518" MODIFIED="1544097877889" TEXT="Managing pictures"/>
+<node CREATED="1544097662510" ID="ID_644866050" MODIFIED="1544097671812" TEXT="Translating contents"/>
+<node CREATED="1544097891659" ID="ID_1424767099" MODIFIED="1544097903922" TEXT="Checking contents"/>
+<node CREATED="1544096558098" ID="ID_137595958" MODIFIED="1544096563856" TEXT="Publication workflow"/>
+<node CREATED="1544097676886" ID="ID_1557710477" MODIFIED="1544097683612" TEXT="Managing versions"/>
+</node>
+</node>
+<node CREATED="1544082568987" ID="ID_1237124146" MODIFIED="1544082574232" POSITION="right" TEXT="Developer Guide">
+<node CREATED="1544082879075" ID="ID_1489654448" MODIFIED="1544082894200" TEXT="Understanding the Zope Component Architecture">
+<node CREATED="1544082896283" ID="ID_1710756735" MODIFIED="1544082902432" TEXT="Interfaces"/>
+<node CREATED="1544082915236" ID="ID_7428496" MODIFIED="1544082920769" TEXT="Utilities"/>
+<node CREATED="1544082921788" ID="ID_1546627954" MODIFIED="1544082930409" TEXT="Adapters and multi-adapters"/>
+<node CREATED="1544082931116" ID="ID_332827509" MODIFIED="1544082935273" TEXT="Vocabularies"/>
+<node CREATED="1544082940348" ID="ID_541075535" MODIFIED="1544082946361" TEXT="Object factories"/>
+<node CREATED="1544098074960" ID="ID_1901808983" MODIFIED="1544098100590" TEXT="Global and local registries"/>
+</node>
+<node CREATED="1544115059152" ID="ID_1056296274" MODIFIED="1544115071079" TEXT="Understanding PyAMS internals">
+<node CREATED="1544115348511" ID="ID_255106617" MODIFIED="1544115352423" TEXT="Annotations"/>
+<node CREATED="1544115075425" ID="ID_1354732796" MODIFIED="1544115129065" TEXT="Traversal"/>
+<node CREATED="1544115755889" ID="ID_1461082066" MODIFIED="1544115760969" TEXT="Namespaces"/>
+<node CREATED="1544115763570" ID="ID_336344774" MODIFIED="1544115773090" TEXT="TALES extensions"/>
+<node CREATED="1544115780354" ID="ID_1275796530" MODIFIED="1544115784210" TEXT="Renderers"/>
+<node CREATED="1544115089913" ID="ID_1614700527" MODIFIED="1544115092776" TEXT="Sequences"/>
+<node CREATED="1544115080961" ID="ID_1833425610" MODIFIED="1544115086896" TEXT="Internal references"/>
+<node CREATED="1544115925093" ID="ID_1184932584" MODIFIED="1544115929054" TEXT="Versioning"/>
+<node CREATED="1544115943790" ID="ID_522624468" MODIFIED="1544115947990" TEXT="Catalog"/>
+<node CREATED="1544115097217" ID="ID_1275482431" MODIFIED="1544115101416" TEXT="Views"/>
+<node CREATED="1544115102393" ID="ID_75026590" MODIFIED="1544115108000" TEXT="Search engines"/>
+</node>
+<node CREATED="1544087448678" ID="ID_870090035" MODIFIED="1544097505000" TEXT="Creating new PyAMS packages"/>
+<node CREATED="1544097520090" ID="ID_1270103047" MODIFIED="1544097534824" TEXT="Overriding PyAMS features"/>
+<node CREATED="1544082628492" ID="ID_699809555" MODIFIED="1544096063204" TEXT="Customizong site appearance">
+<node CREATED="1544082754168" ID="ID_54347925" MODIFIED="1544096098196" TEXT="Understanding layers and skins"/>
+<node CREATED="1544082769688" ID="ID_381633468" MODIFIED="1544082796037" TEXT="Creating a new skin"/>
+<node CREATED="1544082796833" ID="ID_254932191" MODIFIED="1544082803606" TEXT="Adding resources"/>
+<node CREATED="1544082805001" ID="ID_519891174" MODIFIED="1544082815118" TEXT="Overriding templates"/>
+<node CREATED="1544082817129" ID="ID_845559019" MODIFIED="1544087512698" TEXT="Creating custom renderers">
+<node CREATED="1544082863338" ID="ID_1737457012" MODIFIED="1544082873103" TEXT="Understanding renderers"/>
+<node CREATED="1544082839162" ID="ID_1670216336" MODIFIED="1544082859183" TEXT="Blocks renderers"/>
+<node CREATED="1544082846050" ID="ID_1172561551" MODIFIED="1544082855631" TEXT="Portlets renderers"/>
+</node>
+</node>
+<node CREATED="1544087386389" ID="ID_194719499" MODIFIED="1544087399035" TEXT="Understanding PyAMS forms">
+<node CREATED="1544115863164" ID="ID_229345860" MODIFIED="1544115866252" TEXT="Add forms"/>
+<node CREATED="1544115867076" ID="ID_1405962622" MODIFIED="1544115869772" TEXT="Edit forms"/>
+<node CREATED="1544115877076" ID="ID_1316940147" MODIFIED="1544115880055" TEXT="AJAX forms"/>
+</node>
+<node CREATED="1544082988750" ID="ID_1149872582" MODIFIED="1544083027635" TEXT="Creating new blocks"/>
+<node CREATED="1544083000110" ID="ID_1040940022" MODIFIED="1544083007435" TEXT="Creating new portlets"/>
+<node CREATED="1544083029615" ID="ID_1442734952" MODIFIED="1544083043084" TEXT="Creating new content types"/>
+<node CREATED="1544096570163" ID="ID_727161321" MODIFIED="1544096576656" TEXT="Creating custom workflows"/>
+<node CREATED="1544096356174" ID="ID_1702594283" MODIFIED="1544097090606" TEXT="Advanced features">
+<node CREATED="1544097101632" ID="ID_326358843" MODIFIED="1544097111406" TEXT="Managing schema generations"/>
+<node CREATED="1544097113160" ID="ID_1616875667" MODIFIED="1544097120038" TEXT="Renaming persistent classes"/>
+<node CREATED="1544096504129" ID="ID_1045720413" MODIFIED="1544097136871" TEXT="Including SQLAlchemy"/>
+<node CREATED="1544096589563" ID="ID_1472388336" MODIFIED="1544096596257" TEXT="Using GIS features"/>
+<node CREATED="1544097632077" ID="ID_432544873" MODIFIED="1544097651715" TEXT="Internationalization"/>
+</node>
+</node>
+<node CREATED="1544083259989" ID="ID_686416345" MODIFIED="1544083265370" POSITION="right" TEXT="Reference Guide">
+<node CREATED="1544087430934" ID="ID_713736923" MODIFIED="1544087437980" TEXT="PyAMS packages layout"/>
+<node CREATED="1544083268621" ID="ID_445126260" MODIFIED="1544083282858" TEXT="PyAMS packages reference">
+<node CREATED="1544084973632" ID="ID_72802131" MODIFIED="1544084978229" TEXT="Core packages">
+<node CREATED="1544115248165" ID="ID_438235748" MODIFIED="1544115252156" TEXT="PyAMS_template"/>
+<node CREATED="1544115257445" ID="ID_711635676" MODIFIED="1544115261532" TEXT="PyAMS_viewlet"/>
+<node CREATED="1544115265077" ID="ID_1787594185" MODIFIED="1544115269557" TEXT="PyAMS_pagelet"/>
+<node CREATED="1544115150754" ID="ID_1262331500" MODIFIED="1544115159770" TEXT="PyAMS utils"/>
+<node CREATED="1544115277197" ID="ID_977438221" MODIFIED="1544115280237" TEXT="PyAMS_skin"/>
+<node CREATED="1544115291542" ID="ID_1406972832" MODIFIED="1544115294589" TEXT="PyAMS_form"/>
+<node CREATED="1544115298710" ID="ID_419603525" MODIFIED="1544115301621" TEXT="PyAMS_file"/>
+<node CREATED="1544115302358" ID="ID_1331884867" MODIFIED="1544115305629" TEXT="PyAMS_i18n"/>
+<node CREATED="1544115308942" ID="ID_1268742277" MODIFIED="1544115313360" TEXT="PyAMS_security"/>
+<node CREATED="1544115368064" ID="ID_1450501454" MODIFIED="1544115371423" TEXT="PyAMS_catalog"/>
+<node CREATED="1544115379448" ID="ID_77567705" MODIFIED="1544115382736" TEXT="PyAMS_mail"/>
+<node CREATED="1544115405073" ID="ID_543606354" MODIFIED="1544115407976" TEXT="PyAMS_cache"/>
+<node CREATED="1544115423681" ID="ID_1797650049" MODIFIED="1544115427641" TEXT="PyAMS_zmq"/>
+<node CREATED="1544115432697" ID="ID_658794955" MODIFIED="1544115439625" TEXT="PyAMS_scheduler"/>
+<node CREATED="1544115324591" ID="ID_781904493" MODIFIED="1544115329734" TEXT="PyAMS_zmi"/>
+</node>
+<node CREATED="1544115172003" ID="ID_1183856894" MODIFIED="1544115317434" TEXT="CMS packages">
+<node CREATED="1544115469546" ID="ID_391514030" MODIFIED="1544115479466" TEXT="PyAMS_sequence"/>
+<node CREATED="1544115448897" ID="ID_459971302" MODIFIED="1544115452380" TEXT="PyAMS_workflow"/>
+<node CREATED="1544115458050" ID="ID_1882190954" MODIFIED="1544115461810" TEXT="PyAMS_thesaurus"/>
+<node CREATED="1544115487963" ID="ID_1008624380" MODIFIED="1544115491387" TEXT="PyAMS_portal"/>
+<node CREATED="1544115179275" ID="ID_875008847" MODIFIED="1544115187866" TEXT="PyAMS_content"/>
+<node CREATED="1544115532620" ID="ID_308306764" MODIFIED="1544115538644" TEXT="PyAMS_default_theme"/>
+</node>
+<node CREATED="1544084981248" ID="ID_652347540" MODIFIED="1544115232692" TEXT="Optional packages">
+<node CREATED="1544115188851" ID="ID_1824457173" MODIFIED="1544115529941" TEXT="PyAMS_content_es"/>
+<node CREATED="1544115234868" ID="ID_1793033053" MODIFIED="1544115238436" TEXT="PyAMS_apm"/>
+<node CREATED="1544115334599" ID="ID_251599867" MODIFIED="1544115340166" TEXT="PyAMS_zodbbrowser"/>
+<node CREATED="1544115390608" ID="ID_1261494745" MODIFIED="1544115394400" TEXT="PyAMS_ldap"/>
+<node CREATED="1544115395144" ID="ID_1583801150" MODIFIED="1544115398200" TEXT="PyAMS_gis"/>
+<node CREATED="1544115413113" ID="ID_1208042685" MODIFIED="1544115416857" TEXT="PyAMS_alchemy"/>
+<node CREATED="1544115499643" ID="ID_815757061" MODIFIED="1544115502827" TEXT="PyAMS_media"/>
+<node CREATED="1544115506747" ID="ID_652582792" MODIFIED="1544115510195" TEXT="PyAMS_notify"/>
+</node>
+</node>
+</node>
+<node CREATED="1544096456488" ID="ID_1474680909" MODIFIED="1544113650995" POSITION="right" TEXT="About PyAMS">
+<node CREATED="1544113668958" ID="ID_141166066" MODIFIED="1544113686332" TEXT="Contact"/>
+<node CREATED="1544113659493" ID="ID_1234780627" MODIFIED="1544113662940" TEXT="License"/>
+<node CREATED="1544113675254" ID="ID_262358310" MODIFIED="1544113681068" TEXT="Code repository"/>
+<node CREATED="1544115632558" ID="ID_1155761946" MODIFIED="1544115637489" TEXT="Contributing"/>
+<node CREATED="1544115600093" ID="ID_1212171131" MODIFIED="1544115646409" TEXT="Support"/>
+</node>
+</node>
+</map>

Binary file docs/PyAMS User Guide.png has changed

--- a/src/source/packages.rst	Thu Dec 06 08:24:10 2018 +0100
+++ b/src/source/packages.rst	Mon Dec 10 14:14:57 2018 +0100
@@ -10,18 +10,16 @@
 .. toctree::
    :maxdepth: 1
 
-   PyAMS Security <api-doc/pyams_security/pyams_security>
    PyAMS Utils <api-doc/pyams_utils/pyams_utils>
+   PyAMS ZMI <api-doc/pyams_zmi/pyams_zmi>
+   PyAMS Content <api-doc/pyams_content/pyams_content>
+   PyAMS Skin <api-doc/pyams_skin/pyams_skin>
+   PyAMS Catalog <api-doc/pyams_catalog/pyams_catalog>
+   PyAMS Form <api-doc/pyams_form/pyams_form>
+   PyAMS Portal <api-doc/pyams_portal/pyams_portal>
    PyAMS Template <api-doc/pyams_template/pyams_template>
    PyAMS Pagelet <api-doc/pyams_pagelet/pyams_pagelet>
    PyAMS Viewlet <api-doc/pyams_viewlet/pyams_viewlet>
-   PyAMS Form <api-doc/pyams_form/pyams_form>
-   PyAMS Skin <api-doc/pyams_skin/pyams_skin>
-   PyAMS ZMI <api-doc/pyams_zmi/pyams_zmi>
-   PyAMS File <api-doc/pyams_file/pyams_file>
-   PyAMS Content <api-doc/pyams_content/pyams_content>
-   PyAMS Portal <api-doc/pyams_portal/pyams_portal>
-   PyAMS default theme <api-doc/pyams_default_theme/pyams_default_theme>
 
 
 Additional PyAMS packages
@@ -32,20 +30,22 @@
 .. toctree::
    :maxdepth: 1
 
-   PyAMS Alchemy <api-doc/pyams_alchemy/pyams_alchemy>
+   PyAMS Alchemy  <api-doc/pyams_alchemy/pyams_alchemy>
    PyAMS Cache <api-doc/pyams_cache/pyams_cache>
-   PyAMS Catalog <api-doc/pyams_catalog/pyams_catalog>
    PyAMS Content with ElasticSearch <api-doc/pyams_content_es/pyams_content_es>
+   PyAMS Default theme <api-doc/pyams_default_theme/pyams_default_theme>
+   PyAMS File <api-doc/pyams_file/pyams_file>
    PyAMS GIS <api-doc/pyams_gis/pyams_gis>
    PyAMS I18N <api-doc/pyams_i18n/pyams_i18n>
    PyAMS LDAP <api-doc/pyams_ldap/pyams_ldap>
    PyAMS Mail <api-doc/pyams_mail/pyams_mail>
    PyAMS Media <api-doc/pyams_media/pyams_media>
    PyAMS Notify <api-doc/pyams_notify/pyams_notify>
-   PyAMS WebSocket notifications <api-doc/pyams_notify_ws/pyams_notify_ws>
+   PyAMS Notify with WebSocket<api-doc/pyams_notify_ws/pyams_notify_ws>
    PyAMS Scheduler <api-doc/pyams_scheduler/pyams_scheduler>
+   PyAMS Thesaurus <api-doc/pyams_thesaurus/pyams_thesaurus>
+   PyAMS Security <api-doc/pyams_security/pyams_security>
    PyAMS Sequence <api-doc/pyams_sequence/pyams_sequence>
-   PyAMS Thesaurus <api-doc/pyams_thesaurus/pyams_thesaurus>
    PyAMS Workflow <api-doc/pyams_workflow/pyams_workflow>
    PyAMS ZMQ <api-doc/pyams_zmq/pyams_zmq>
-   PyAMS ZODB browser <api-doc/pyams_zodbbrowser/pyams_zodbbrowser>
+   PyAMS ZODBbrowser <api-doc/pyams_zodbbrowser/pyams_zodbbrowser>