diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
| commit | 054fdbdf7a1e5106725b8b5a36db99242cfa65c1 (patch) | |
| tree | 1633b26e884feb1f29afedbb80cef7a6ecbdba2d /docs/en/import_export.rst | |
| parent | 8a5ba2650678ec22107a1a0a10650b6e0cc14683 (diff) | |
| parent | d02ec4246813eb0787bf3ab54af1af9ce32bd376 (diff) | |
| download | Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.tar.bz2 Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/utils.py
chimere/views.py
example_project/settings.py
Diffstat (limited to 'docs/en/import_export.rst')
| -rw-r--r-- | docs/en/import_export.rst | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/en/import_export.rst b/docs/en/import_export.rst index 6dd1d7a..9144938 100644 --- a/docs/en/import_export.rst +++ b/docs/en/import_export.rst @@ -5,7 +5,7 @@ Import/export ============= :Author: Étienne Loks -:date: 2012-11-28 +:date: 2013-02-01 :Copyright: CC-BY 3.0 This document presents the import/export functionnalities of Chimère. @@ -49,6 +49,11 @@ Common fields be reconciled with the :ref:`amendment form <managing-modified>`. If you don't want to use this form and then overwrite with the data from the external source, check this option. +- **Get description from source**: If this case is checked, the importer will + try to get the description from the source file. This option is only available + for certain file formats. +- **Default description**: A default description to be added to new items. This + field is only available when **Get description from source** is not checked. - **Origin**: if not null this field will be associated to each item imported in order to easily identify where the item came from. For OSM import the source is automatically added. |