Merge branch 'master' of https://github.com/GeoNode/documentation

Author: afabiani

admin/admin_panel/index.rst

@@ -608,6 +608,19 @@ Please see the details of the following GeoNode ``Settings``:
 
 * `RESOURCE_PUBLISHING <../../basic/settings/index.html#resource-publishing>`_
 
+
+Change in owner rights in case of advanced workflow is on
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+After switching ``ADMIN_MODERATE_UPLOADS`` to True and resource is approved owner is no longer able
+to modify it. He will see new button on the resource detail page: Request change. After clicking this, view with short
+form is shown.
+On this view user can write short message why he want to modify the resource.
+
+This message will be sent through messaging and email system to administrators:
+
+After administrator unapprove the resource owner is again able to modify it.
+
 The group Manager approval
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 Here, the role of the Manager of the group to which your layer, document or map is linked is to check that the uploaded item is correct.

intermediate/backup/index.rst

@@ -118,17 +118,30 @@ Settings: [geoserver] Section
 
     [geoserver]
     datadir = /opt/gs_data_dir
+    datadir_exclude_file_path =
     dumpvectordata = yes
     dumprasterdata = yes
+    data_dt_filter =
+    data_layername_filter =
+    data_layername_exclude_filter =
 
 This section allows to enable / disable a full data backup / restore of GeoServer.
 
 * *datadir*: the full path of GeoServer Data Dir, by default ``/opt/gs_data_dir``. The path **must** be accessible and **fully writable** by the ``geonode`` and / or ``httpd server`` users when executing a backup / restore command.
 
+* *datadir_exclude_file_path*: comma separated list of paths to exclude from ``geoserver_catalog.zip``; This list will be sent and managed directly by the GeoServer Backup REST API.
+
 * *dumpvectordata*: a boolean flag enabling or disabling creation of a vector data dump from GeoServer (shapefiles or DB tables). If ``false`` (or ``no``) vector data won't be stored / re-stored.
 
 * *dumprasterdata*: a boolean flag enabling or disabling creation of a raster data dump from GeoServer (geotiffs). If ``false`` (or ``no``) raster data won't be stored / re-stored.
 
+* *data_dt_filter*: {cmp_operator} {ISO8601} e.g. > 2019-04-05T24:00 which means "include on backup archive only the files that have been modified later than 2019-04-05T24:00
+
+* *data_layername_filter*: comma separated list of ``layer names``, optionally with glob syntax e.g.: tuscany_*,italy; Only ``RASTER`` original data and ``VECTORIAL`` table dumps matching those filters will be **included** into the backup ZIP archive
+
+* *data_layername_exclude_filter*: comma separated list of ``layer names``, optionally with glob syntax e.g.: tuscany_*,italy; The ``RASTER`` original data and ``VECTORIAL`` table dumps matching those filters will be **excluded** from the backup ZIP archive
+
+
 .. warning:: Enabling these options **requires** the GeoServer Data Dir to be accessible and **fully writable** for the ``geonode`` and / or ``httpd server`` users when executing a backup / restore command.
 
 Settings: [fixtures] Section
@@ -204,14 +217,20 @@ Restore
 
 The ``restore`` command has a number of arguments, modifying its execution:
 
-# ``-c`` / ``--config``: path to the ``settings.ini`` configuration file
+# ``-c`` / ``--config``: path to the ``settings.ini`` configuration file. If the Backup archive is provided with his settings, the latter will be used by the restore command and this option won't be mandatory anymore
+
+#. ``--skip-geoserver``: the GeoServer backup restoration won't be performed
 
-#. ``--skip-geoserver``: the Geoserver backup restoration won't be performed
+#. ``--skip-geoserver-info``: {Default: True} Skips GeoServer Global Infos, like the proxy base url and other global GeoServer metadata info
+
+#. ``--skip-geoserver-security``: {Default: True} Skips GeoServer all the Security Settings
 
 #. ``--backup-file``: (exclusive together with ``--backup-files-dir``) path to the backup ``.zip`` archive
 
 #. ``--backup-files-dir``: (exclusive together with ``--backup-file``) directory containing backup archives. The directory may contain a number of files, but **only** backup archives are allowed with a ``.zip`` extension. In case multiple archives are present in the directory, the newest one, created after the last already restored backup creation time, will be restored. This option was implemented with a thought of automated restores.
 
+#. ``--recovery-file``: Backup archive containing GeoNode data to restore in case of failure.
+
 #. ``-l`` / ``--with-logs``: the backup file will be checked against the restoration logs (history). In case this backup has already been restored (MD5 based comparision), RuntimeError is raised, preventing restore execution.
 
 #. ``-n`` / ``--notify``: the restore procedure outcome will be send by an e-mail notification to the superusers of the instance (note: notification will be sent to the superusers of the instance before restoration).