diff options
Diffstat (limited to 'docs/en')
| -rw-r--r-- | docs/en/configuration.rst | 11 | ||||
| -rw-r--r-- | docs/en/import_export.rst | 7 | ||||
| -rw-r--r-- | docs/en/install.rst | 11 | ||||
| -rw-r--r-- | docs/en/upgrade.rst | 23 |
4 files changed, 38 insertions, 14 deletions
diff --git a/docs/en/configuration.rst b/docs/en/configuration.rst index e5870bb..2a7f4d0 100644 --- a/docs/en/configuration.rst +++ b/docs/en/configuration.rst @@ -5,7 +5,7 @@ Configuration ============= :Author: Étienne Loks -:date: 2012-10-08 +:date: 2013-02-01 :Copyright: CC-BY 3.0 This document presents the first steps to configure your Chimère. @@ -32,15 +32,6 @@ To access these pages you have to identify with an account with *staff* and A *superuser* account is created at the initialization of the database. -Configuring the Sites framework -------------------------------- - -*Sites* framework allow you to serve the same content on different domains. -Most of you will probably use only one domain but this unique domain has to -be configured. This is done in the web administration interface in *Sites > Sites*. -You only need to change *example.com* by your domain name. If you forget to -do that, some functionalities such as RSS feeds will not work properly. - .. _managing-areas: Managing areas 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. diff --git a/docs/en/install.rst b/docs/en/install.rst index 7ba376b..ff8ac46 100644 --- a/docs/en/install.rst +++ b/docs/en/install.rst @@ -5,7 +5,7 @@ Installation ============ :Author: Étienne Loks -:date: 2012-11-28 +:date: 2013-02-01 :Copyright: CC-BY 3.0 This document presents the installation of Chimère. @@ -292,3 +292,12 @@ line:: . /etc/default/locale +Configuring the Sites framework +******************************* + +*Sites* framework allow you to serve the same content on different domains. +Most of you will probably use only one domain but this unique domain has to +be configured. This is done in the web administration interface in *Sites > Sites*. +You only need to change *example.com* by your domain name. If you forget to +do that, some functionalities such as RSS feeds will not work properly. + diff --git a/docs/en/upgrade.rst b/docs/en/upgrade.rst index ef9d0d1..6dce286 100644 --- a/docs/en/upgrade.rst +++ b/docs/en/upgrade.rst @@ -5,7 +5,7 @@ Upgrade ======= :Author: Étienne Loks -:date: 2012-10-08 +:date: 2013-02-01 :Copyright: CC-BY 3.0 This document presents the upgrade of Chimère. @@ -198,6 +198,12 @@ Move old static files to the new static directory: rm -rf $CHIMERE_PATH/chimere/static/icons rm -rf $CHIMERE_PATH/chimere/static/upload +Update permissions for media directory: + +.. code-block:: bash + + chown www-data -R $CHIMERE_APP_PATH/media/ + Webserver configuration ....................... @@ -295,6 +301,7 @@ Version 1.2 -> 2.0 -> master cd $CHIMERE_PATH/chimere django-admin compilemessages + Forcing the refresh of visitor's web browser cache -------------------------------------------------- @@ -307,8 +314,20 @@ that edit your local_settings.py and change:: to:: - STATIC_URL = '/static/v2.0.0/' + STATIC_URL = '/static-v2.0.0/' Then change the webserver directive to point to your new path. Restart the web server to apply this changes. +Configuring the Sites framework +------------------------------- + +Version 1.2 -> 2.0 +****************** + +*Sites* framework allow you to serve the same content on different domains. +Most of you will probably use only one domain but this unique domain has to +be configured. This is done in the web administration interface in *Sites > Sites*. +You only need to change *example.com* by your domain name. If you forget to +do that, some functionalities such as RSS feeds will not work properly. + |