summaryrefslogtreecommitdiff
path: root/docs/en/administration.rst
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-12-08 01:19:42 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-12-08 01:19:42 +0100
commitfd184becdf661eb33049f7adaf58046281d30740 (patch)
treed27b3ae1fa83130ffaa7ff34fa9855beaae04c03 /docs/en/administration.rst
parent0ce74dad8dc8016e99f15d3cd3a681570c8cce54 (diff)
downloadChimère-fd184becdf661eb33049f7adaf58046281d30740.tar.bz2
Chimère-fd184becdf661eb33049f7adaf58046281d30740.zip
Documentation: update import with overwrite option
Diffstat (limited to 'docs/en/administration.rst')
-rw-r--r--docs/en/administration.rst13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/en/administration.rst b/docs/en/administration.rst
index 8b7e581..73e1dbe 100644
--- a/docs/en/administration.rst
+++ b/docs/en/administration.rst
@@ -179,17 +179,22 @@ If an item is not relevant the **Delete** button enables to remove it.
.. _managing-modified:
-Managing end user amendment
----------------------------
+Managing end user amendment/imported item modified locally
+----------------------------------------------------------
Amendment can be proposed on the main site by end-users.
-In Chimère an amendment is a new item with the status *Modified* and with a link
-to the reference item modified.
+In Chimère an amendment is a new item with the status **Modified** and with a
+link to the reference item modified.
+
+You can also have imported items which have been modified both locally and on
+the external source. The new version from the external source has the status
+**Imported** and have a link to the reference item.
.. Note::
If you are logged as an administrator and make changes on the map with the
end user form they will be directly validated.
+
A special form has been developed to facilitate the processing of these
modified items.