camptocamp · jwkaltz · Oct 30, 2017 · Oct 26, 2017 · Oct 26, 2017 · Oct 27, 2017
diff --git a/.gitignore b/.gitignore
@@ -27,12 +27,6 @@
 /doc/administrator/administrate.rst
 /doc/developer/client_side.rst
 /doc/index.rst
-/doc/integrator/legacy_cgxp.rst
-/doc/integrator/editing.rst
-/doc/integrator/features.rst
-/doc/integrator/fulltext_search.rst
-/doc/integrator/print.rst
-/doc/integrator/upgrade_application.rst
 /dist/
 /coverage.xml
 /gatling/.classpath

diff --git a/doc/administrator/administrate.rst.mako → doc/administrator/administrate.rst b/doc/administrator/administrate.rst.mako → doc/administrator/administrate.rst
@@ -127,10 +127,10 @@ The layers in the admin interface have the following attributes:
   the given layer, used to zoom to visible scale, with WMS if it is empty
   we get the values from the capabilities.
 * ``Disclaimer``: optional, copyright of the layer, used by
-  `Disclaimer <http://docs.camptocamp.net/cgxp/${main_version}/lib/plugins/Disclaimer.html>`_.
+  `Disclaimer <http://docs.camptocamp.net/cgxp/2.2/lib/plugins/Disclaimer.html>`_.
 * ``Identifier attribute field``: field used to identify a feature from the
   layer, e.g.: 'name', used by
-  `FeaturesWindow <http://docs.camptocamp.net/cgxp/${main_version}/lib/plugins/FeaturesWindow.html>`_.
+  `FeaturesWindow <http://docs.camptocamp.net/cgxp/2.2/lib/plugins/FeaturesWindow.html>`_.
 * ``Restrictions area``: the areas throw witch the user can see the layer.
 
 On ``internal WMS`` layer we have the following specific attributes:

diff --git a/doc/administrator/index.rst b/doc/administrator/index.rst
@@ -4,7 +4,7 @@
 Administrator Guide
 ===================
 
-This chapter describes how to install, deploy, and administrate a c2cgeoportal
+This chapter describes how to administrate a c2cgeoportal
 application.
 
 The application administrator configures and administrates the application
@@ -23,3 +23,4 @@ Content:
    editing
    mapfile
    tinyows
+   wmstime
diff --git a/doc/integrator/wmstime.rst → doc/administrator/wmstime.rst b/doc/integrator/wmstime.rst → doc/administrator/wmstime.rst
diff --git a/doc/developer/client_side.rst.mako → doc/developer/client_side.rst b/doc/developer/client_side.rst.mako → doc/developer/client_side.rst
@@ -47,7 +47,7 @@ Dependencies
 
 Major dependencies docs:
 
-* `CGXP <http://docs.camptocamp.net/cgxp/${main_version}/>`_
+* `CGXP <http://docs.camptocamp.net/cgxp/2.2/>`_
 * `GXP <http://gxp.opengeo.org/master/doc/>`_
 * `GeoExt <http://dev.geoext.org/geoext/docs/lib/>`_
 * `OpenLayers <http://dev.openlayers.org/apidocs/files/OpenLayers-js.html>`_

diff --git a/doc/integrator/authentication.rst b/doc/integrator/authentication.rst
@@ -1,10 +1,8 @@
-.. _integrator_authentication:
-
 Authentication
-==============
+--------------
 
 The default policy
-------------------
+~~~~~~~~~~~~~~~~~~
 
 By default ``c2cgeoportal`` applications use an *auth ticket* authentication
 policy (``AuthTktAuthenticationPolicy``). With this policy the user name is
@@ -14,7 +12,7 @@ The policy is created, and added to the application's configuration, in the
 application's main ``__init__.py`` file.
 
 Using another policy
---------------------
+~~~~~~~~~~~~~~~~~~~~
 
 When using ``AuthTktAuthenticationPolicy`` an "auth ticket" cookie should be
 set in the request for the user to be identified. In some applications using
@@ -168,7 +166,7 @@ an alias in a project-specific callback and use it instead of the standard
 You should be set at this point.
 
 Custom user validation
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 For logging in ``c2cgeoportal`` validates the user credentials
 (username/password) by reading the user information from the ``user`` database

diff --git a/doc/integrator/backend.rst b/doc/integrator/backend.rst
@@ -1,12 +1,12 @@
 .. _integrator_backend:
 
-Specific Backend Documentation
+Specific Backend Configuration
 ==============================
 
 This section describes the specificities required by some specific backend.
 
-By defaut C2cgeoportal is configured to use Mapserver, but it is possible to
-user other backends.
+By default C2cgeoportal is configured to use Mapserver, but it is possible to
+use other backends.
 
 .. toctree::
    :maxdepth: 1

diff --git a/doc/integrator/configuration.rst b/doc/integrator/configuration.rst
@@ -0,0 +1,22 @@
+.. _configuration_guide:
+
+Configuration Guide for advanced settings
+-----------------------------------------
+
+This chapter describes advanced configuration settings.
+
+.. toctree::
+   :maxdepth: 1
+
+   make
+   ngeo
+   backend
+   caching
+   cluster
+   filter
+   fulltext_search
+   internationalization
+   shortener
+   subdomain
+   tilegeneration
+   windows_tools
diff --git a/doc/integrator/customise.rst b/doc/integrator/customise.rst
@@ -4,15 +4,18 @@
 Customise the application
 =========================
 
-There is two generic ways to customise the application.
+.. toctree::
+   :maxdepth: 2
 
-The ``functionnalities`` and the ``UI metadata``.
+The application can be customised in the following manners:
+
+``functionalities``, ``UI metadata`` and data model extensions.
 
 The functionalities will be attached to the ``role`` and the ``theme``,
 and the UI metadata will be attached to all the elements of the theme.
 
 They should be configured in the vars file, in the ``admin_interface`` /
-``available_functionnalities`` or respectively ``available_metadata``.
+``available_functionalities`` or respectively ``available_metadata``.
 
 It is a list of object who have a ``name`` and a ``type``.
 
@@ -54,3 +57,7 @@ In the admin interface we can use in all the URLs the following special schema:
 
   ``config://my_server/icon.png`` will be transformed into
   the URL ``http://example.com/test/icon.png``.
+
+.. include:: functionality.rst
+
+.. include:: extend_data_model.rst
diff --git a/doc/integrator/extend_data_model.rst b/doc/integrator/extend_data_model.rst
@@ -1,7 +1,5 @@
-.. _integrator_extend_data_model:
-
 Extend the data model
-=====================
+---------------------
 
 The Data model can be extended in the file ``<package>/models.py``
 and the corresponding admin interface configuration

diff --git a/doc/integrator/features.rst b/doc/integrator/features.rst
@@ -0,0 +1,22 @@
+.. _integrator_features:
+
+Additional features
+===================
+
+This section describes how to add features to a c2cgeoportal project,
+and configure them.
+
+Features that require additional steps (most of the time):
+
+.. toctree::
+   :maxdepth: 1
+
+   ngeo
+   object_editing
+   raster
+   print
+   api
+   reset_password
+   intranet
+   urllogin
+   pdfreport
diff --git a/doc/integrator/features.rst.mako b/doc/integrator/features.rst.mako
diff --git a/doc/integrator/fulltext_search.rst.mako → doc/integrator/fulltext_search.rst b/doc/integrator/fulltext_search.rst.mako → doc/integrator/fulltext_search.rst
@@ -3,22 +3,6 @@
 Full-text search
 ================
 
-Enabling the *full-text search* feature involves adding a ``FullTextSearch``
-plugin to the viewer, and creating and populating a dedicated table in the
-database.
-
-The FullTextSearch plugin
--------------------------
-
-The viewer should include a ``FullTextSearch`` plugin for the *text search*
-feature to be available in the user interface.
-
-See the `FullTextSearch API doc
-<http://docs.camptocamp.net/cgxp/${main_version}/lib/plugins/FullTextSearch.html>`_ for the
-list of options the plugin can receive.
-
-*The main viewer includes a FullTextSearch plugin by default.*
-
 The full-text search table
 --------------------------
 
@@ -153,7 +137,7 @@ For instance to specify a ``floor``:
 
 Query string ``floor=1`` is then automatically appended to all WMS requests.
 
-See `FloorSlider <http://docs.camptocamp.net/cgxp/${main_version}/lib/plugins/FloorSlider.html>`_
+See `FloorSlider <http://docs.camptocamp.net/cgxp/2.2/lib/plugins/FloorSlider.html>`_
 for more information.
 
 Actions

diff --git a/doc/integrator/functionality.rst b/doc/integrator/functionality.rst
@@ -1,7 +1,5 @@
-.. _integrator_functionality:
-
-Customizing the Application using Functionalities
-=================================================
+Functionalities
+---------------
 
 c2cgeoportal provides the concept of *functionality* that can be used to customize
 the application according to the user's permissions.
@@ -25,10 +23,8 @@ the ``user`` database table, then the ``functionalities:anonymous`` and
 ``functionalities:registered`` configuration variables, as well as any
 functionality associated with his/her role, will be ignored.
 
-.. _integrator_functionality_configuration:
-
 Configuration
--------------
+~~~~~~~~~~~~~
 
 The ``vars_<project>.yaml`` file includes variables for managing *functionalities*.
 
@@ -95,10 +91,10 @@ The ``vars_<project>.yaml`` file includes variables for managing *functionalitie
     then the ``functionality`` template variable will be set to a dict with one
     key/value pair: ``"<functionality_name>": ["value1","value2"]``.
 
-Using Functionalities in Templates
-----------------------------------
+Usage in Templates
+~~~~~~~~~~~~~~~~~~
 
-As explained in the :ref:`integrator_functionality_configuration` section above,
+As explained in the configuration section above,
 a functionality can be used in the Mako templates as long as it has been
 enabled using the ``functionalities:available_in_templates`` parameter in the
 ``vars_<project>.yaml`` configuration file.

diff --git a/doc/integrator/https.rst b/doc/integrator/https.rst
@@ -1,7 +1,5 @@
-.. _integrator_https:
-
 HTTPS
-=====
+-----
 
 If your application is accessed in HTTPS, you have to make sure that all URLs
 generated by the application (CSS and Javascript files, images, MapServer

diff --git a/doc/integrator/index.rst b/doc/integrator/index.rst
@@ -4,51 +4,23 @@
 Integrator Guide
 ================
 
+This chapter describes how to install, deploy, and customize a
+c2cgeoportal application. Furthermore, it describes how to
+configure the files of the application.
+
 Content:
 
 .. toctree::
    :maxdepth: 2
 
-   api
-   authentication
-   backend_arcgis
-   backend_geoserver
-   backend_qgis
-   backend
-   caching
-   checker
-   cluster
+   requirements
    create_application
+   install_application
+   upgrade_application
+   configuration
    customise
-   docker
-   editing
-   extend_data_model
+   security
    features
-   filter
-   fulltext_search
-   functionality
-   https
-   install_application
-   internationalization
-   intranet
-   legacy_advanced
-   legacy_cgxp
-   legacy_print
+   docker
+   operations
    legacy
-   make
-   ngeo
-   object_editing
-   pdfreport
-   print
-   raster
-   requirements
-   reset_password
-   security
-   shortener
-   statistics
-   subdomain
-   tilegeneration
-   upgrade_application
-   urllogin
-   windows_tools
-   wmstime
diff --git a/doc/integrator/legacy.rst b/doc/integrator/legacy.rst
@@ -7,5 +7,6 @@ Legacy components
    :maxdepth: 1
 
    legacy_cgxp
+   legacy_editing
    legacy_print
    legacy_advanced