Update documentation

25 files changed, 606 insertions, 190 deletions

diff --git a/docs/_build/html/_images/chimere_admin_modified_management.png b/docs/_build/html/_images/chimere_admin_modified_management.png
new file mode 100644
index 0000000..84e069e
--- /dev/null
+++ b/docs/_build/html/_images/chimere_admin_modified_management.png
diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt
index db7e078..2f8ddb5 100644
--- a/docs/_build/html/_sources/administration.txt
+++ b/docs/_build/html/_sources/administration.txt
@@ -60,7 +60,7 @@ Item list
 #. search items by word (not available for all type of items)
 #. this filter box permit to filter current entries with some criteria (not
    available for all type of items)
-#. the header of the table is clickable. Click on an header sort the items by
+#. the header of the table is cliquable. Click on an header sort the items by
    this header (ascending or descending). Multiple header sort is possible (the
    number on the right of the header explain the order of sorting).
 #. each item can be checked (for applying an action) or selected (by clicking on
@@ -80,36 +80,121 @@ Item form
    item, they can be ordered by drag and drop.
 #. the form has to be validated by one of theses actions buttons. They are
    self-explanatory.
-Creating news
+
+Status
+******
+
+*Status* is a property attached to each geographic item in Chimère. To
+administrate efficiently Chimère you need to understand the mean of each status.
+
+- **Submited**: Status of a new item freshly proposed by an end user. This item
+  is not visible on the map.
+- **Available**: Status of an item visible on the map.
+- **Disabled**: Status of a discarded item.
+- **Modified**: Status of an amendment proposed by an end-user.
+- **Imported**: Status of a newly imported item. Import and export operations
+  need that all items with *imported* status are treated (validated, disabled
+  or deleted).
+
+
+Managing news
 -------------
 
 A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.
+All you have to to do is to click on the **Add** button near News.
+For each news you have to provided a name and a content. The content can contain
+HTML tags.
+The availability is set with a checkbox.
 
 Creating categories/subcategories
 ---------------------------------
 
-Before adding categories you have to set some icons. Theses icons appears on the map and in the categories' box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.
+Before adding categories you have to set some icons. Theses icons appears on the
+map and in the categories' box on the main map.
+Be careful to resize correctly your icons. Indeed the icon will be presented at
+their real size on the map.
+To add icons: the **Add** button near Icons.
+
+Categories are in fact only containers for subcategories. You'll have to provide
+only a name and an order.
+To add categories: the **Add** button near categories (quite clear now, isn't
+it?)
+
+Fields of subcategories are: an associated category, a name, an icon, an order,
+a color and an element type.
+Theses fields are mainly quite self- explanatory.
+The color is used to draw routes (if this subcategory contains routes). If it a
+basic color it can be set with the English name (for instance: *red*, *blue*,
+*yellow* or *purple*) otherwise you can put the HTML RVB code (for instance
+*#9227c9*).
+The element type is the type of element the subcategory can contain: POI, route
+or both.
+
+Edition/moderation of items
+---------------------------
 
-Categories are in fact only containers for subcategories. You'll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn't it?)
+The moderation step is quite simple. It works the same with POIs and routes.
+The moderator can access to all POIs (or routes) by clicking on them on the
+list.
 
-Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: "red", "blue", "yellow" or "purple") otherwise you can put the HTML RVB code (for instance "#9227c9").
-The element type is the type of element the subcategory can contain: POI, route or both.
+A search field is available to search by name but the more interesting is to
+filter POIs (or route) by state and by subcategory.
 
-Moderation
-----------
+There is a some actions available in the action list.
 
-The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.
+- **Delete** to delete selected items. A confirmation step is displayed.
+- **Validate** to set the status *Available* to selected items.
+- **Disable** to set teh status *Disabled* to selected items. This is useful to
+  keep items you don't want to be exposed on the map.
+- **Managed modified items** to manage the amendment made by end users on the
+  main site cf. to :ref:`managing-modified`. Modified item has to be treated
+  one by one.
+- **Export to...** to export selected item to the selected format.
+
+
+To modify an item, classically you have to click on his name.
+Then you access to a form to freely modify the item.
+In this form there is all data available to the end user form plus some extra
+fields. The *Import fields* only make sense with data imported from an external
+source or for data to be exported to OSM cf. to the :ref:`import section
+<importing>` of this documentation. *Associated items fields* are read only
+fields that list items associated to the current one (reference item of an
+amendment, associated file of a route).
+
+Associated multimedia items are at the bottom of the form. You can freely add,
+change items and change their order with drag and drop.
+
+Don't forget to validate your change with one of the **Save** buttons at the
+bottom of the form (it is easily forgot when you change multimedia items).
+
+If an item is not relevant the **Delete** button permit to remove it.
+
+.. _managing-modified:
+
+Managing end user amendment
+---------------------------
+
+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.
+
+.. Note::
+   If you are logged as an administrator and make changes on the map with the
+   end user form there will be directly validated.
+
+A special form has been developed to facilitate the processing of theses
+modified items.
+
+You can access to this special form with the action *Managed modified items*.
+
+.. image:: _static/chimere_admin_modified_management.png
+
+This form is a table with three columns.
+
+#. The first column display the information for the reference item.
+#. The second column display the information proposed by the submitter.
+#. The third column is a list of checkboxes. For each row checked, after the
+   validation, the value of the modified item will replace the value of the
+   reference item.
 
+To reject all modification validate the form with no checkbox checked.
diff --git a/docs/_build/html/_sources/configuration.txt b/docs/_build/html/_sources/configuration.txt
index f8bed2b..0565509 100644
--- a/docs/_build/html/_sources/configuration.txt
+++ b/docs/_build/html/_sources/configuration.txt
@@ -33,6 +33,16 @@ To access theses pages you have to identify you 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 forgot to
+do that functionality such as RSS feeds will not work properly.
+
+.. _managing-areas:
 
 Managing areas
 --------------
@@ -40,29 +50,36 @@ Managing areas
 An *Area* is the base of your map. It defines:
 
 * a name: a human readable label for this area.
+* an associated URN (*not mandatory*): the name of the area as a web ressource.
+  In practice, if the area is not the default area the URN is used at the end of
+  the default URL to access to this area. This is not mandatory but necessary
+  for each area that is not the default one.
 * a welcome message (*not mandatory*): this message is displayed once a day per
   user arriving on the map.
-* a map bounding box: this is the default area to display when arriving on the
-  map.
-* restriction on the bounding box: if set to restricted, the end user can't pan
-  outside the defined bounding box.
-* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
-  render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
-  available by default. You can add new custom layer cf. :ref:`managing-layers`.
-* categories restriction (*not mandatory*): if no restriction is set all
-  categories are available.
+* an order (to sort areas).
+* an availability.
+* a default state. The /default/ area is viewed by default. Only one area can
+  be the default: activating this state disable it on the possible other area
+  with a default state.
 * default checked categories (*not mandatory*).
-* an external CSS file (*not mandatory*): an URL to an external CSS file.
 * if categories are displayed dynamically (if dynamically is set, the end user
   only view categories witch have items on the map section the user currently
   see).
-* an associated URN (*not mandatory*): the name of the area as a web ressource.
-  In practice, if the area is not the default area the URN is used at the end of
-  the default URL to access to this area. This is not mandatory but necessary
-  for each area that is not the default one.
+* categories restriction (*not mandatory*): if no restriction is set all
+  categories are available.
+* an external CSS file (*not mandatory*): an URL to an external CSS file.
+* restriction on the bounding box: if set to restricted, the end user can't pan
+  outside the defined bounding box. Due to technical reasons, there is at this
+  time no restriction on the zoom.
+* a map bounding box: this is the area to display when arriving on the map. If
+  the area is restricted it will be the bounding box that restrict the end user.
+  Hold the control key, click and drag to draw the bounding box.
+* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
+  render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
+  available by default. You can add new custom layer cf. :ref:`managing-layers`.
 
 *Areas* are customizable directly on the web administration interface in
-*Chimere/Areas*.
+*Chimere > Areas*.
 
 As there is little chance that the default area is appropriate for you, you'll
 have to set at least one default area.
@@ -92,8 +109,8 @@ and a default password (the user can change it on in own later).
 
 Then complete the other pieces of information.
 
-Check the case: *Staff status* (or this user will not be able to log to
-the administration website).
+Check the case: *Staff status* (or this user will not be able to log to the
+administration website).
 
 If this account is a new technical administrator, check *Superuser status* (this
 user must be trustworthy!). Otherwise you'll have to give permissions to this
@@ -151,15 +168,19 @@ model*).
 The administration page ask you for:
 
 * a name,
-* an order (to order between other properties),
+* an order (to sort properties),
 * an availability to the end user (this can be used to set hidden properties),
 * a mandatory status,
 * the categories the property applied to (if no categories selected it applied
   to all),
 * the type: text, long text, password or date.
 
-To make this property available it is necessary to reload your webserver (the
+To make this property available it is necessary to reload your web server (the
 property is cached).
 
 All forms are then automatically updated with this new field.
 
+If you don't want to allow add and modification of properties you can disable
+this form by setting CHIMERE_HIDE_PROPERTYMODEL to *True* in your
+*local_settings.py* file.
+
diff --git a/docs/_build/html/_sources/customisation.txt b/docs/_build/html/_sources/customisation.txt
index e27be01..19002dc 100644
--- a/docs/_build/html/_sources/customisation.txt
+++ b/docs/_build/html/_sources/customisation.txt
@@ -12,13 +12,41 @@ This documents presents the installation of Chimère.
 The version has been updated for version 2.0.0.
 
 
-Updating the design
--------------------
-
-You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.
-
-After this basic configuration done the harder is done. You can do now application administration tasks.
-
 .. _managing-layers:
+
 Managing layers
 ---------------
+
+There is some different layers available by default in Chimère (OSM Mapnik, OSM
+Mapquest, OSM Transport map, OSM Cyclemap). You can add some extra layer using
+the web administration pages of Chimère. The new layer is defined with the
+appropriate `Openlayers <http://openlayers.org/>`_ JS code. This JS code must
+be a compatible Openlayers Layer instance with no ending semi-colon. For
+instance defining a Bing layer can be done with this kind of code::
+
+    new OpenLayers.Layer.Bing({
+                name: "Aerial",
+                key: "my-bing-API-key",
+                type: "Aerial"})
+
+
+Refer to the `Openlayers documentation API
+<http://dev.openlayers.org/releases/OpenLayers-2.12/doc/apidocs/files/OpenLayers-js.html>`_
+for more details.
+
+
+Customizing the layout and the design
+-------------------------------------
+
+If you only want to customize the CSS, the easiest way to do it is to add a
+link to an extra CSS to your *Areas* cf. :ref:`managing-areas`.
+
+If you want to do larger changes in the layout and the style the (well named)
+example_project can be customized to fit your needs. Each template file present
+in the *chimere/templates* directory can be copied in your *myproject/templates*
+directory and then modified.
+You only need to copy files that you want to modify. Theses files are in
+Django template language mainly made of pure HTML with some logic. Refer to
+the `Django template documentation <https://docs.djangoproject.com/en/1.4/ref/templates/>`_
+for more details.
+
diff --git a/docs/_build/html/_sources/import_export.txt b/docs/_build/html/_sources/import_export.txt
index 890a644..3d4b0ed 100644
--- a/docs/_build/html/_sources/import_export.txt
+++ b/docs/_build/html/_sources/import_export.txt
@@ -11,4 +11,7 @@ Chimère import/export
 This documents presents the administration of Chimère.
 The version has been updated for version 2.0.0.
 
+.. _importing:
 
+Importing
+---------
diff --git a/docs/_build/html/_sources/index.txt b/docs/_build/html/_sources/index.txt
index 45f40e0..ee1dd6f 100644
--- a/docs/_build/html/_sources/index.txt
+++ b/docs/_build/html/_sources/index.txt
@@ -12,6 +12,6 @@ Welcome to Chimère's documentation!
    install
    upgrade
    configuration
-   customisation
    administration
    import_export
+   customisation
diff --git a/docs/_build/html/_sources/install.txt b/docs/_build/html/_sources/install.txt
index 2dd745b..10c333e 100644
--- a/docs/_build/html/_sources/install.txt
+++ b/docs/_build/html/_sources/install.txt
@@ -60,7 +60,7 @@ Linux distribution repositories. For instance on Debian Wheezy::
 
 On Debian Squeeze (you need to activate backports)::
 
-    apt-get install -t squeeze-backports python-django
+    apt-get install -t squeeze-backports python-django libjs-jquery
 
     apt-get install python python-django-south python-beautifulsoup tinymce \
         apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \
@@ -272,3 +272,11 @@ To activate the website reload apache::
     a2ensite chimere
     /etc/init.d/apache2 reload
 
+If you encounter problem with the upload of files with Unicode chars in their
+names activate the appropriate locale in Apache. On a Debian server with UTF-8
+as default encoding in the file */etc/apache2/envvars* uncomment the following
+line::
+
+    . /etc/default/locale
+
+
diff --git a/docs/_build/html/_sources/upgrade.txt b/docs/_build/html/_sources/upgrade.txt
index f2d0d64..d7c7233 100644
--- a/docs/_build/html/_sources/upgrade.txt
+++ b/docs/_build/html/_sources/upgrade.txt
@@ -45,7 +45,7 @@ Then install the new dependencies::
 
     apt-get install -t squeeze-backports python-django python-django-south \
                        python-simplejson libjs-jquery-ui python-pyexiv2 \
-                       python-feedparser javascript-common
+                       python-feedparser javascript-common libjs-jquery
 
 Debian Wheezy
 +++++++++++++
diff --git a/docs/_build/html/_static/chimere_admin_modified_management.png b/docs/_build/html/_static/chimere_admin_modified_management.png
new file mode 100644
index 0000000..84e069e
--- /dev/null
+++ b/docs/_build/html/_static/chimere_admin_modified_management.png
diff --git a/docs/_build/html/_static/jquery.js b/docs/_build/html/_static/jquery.js
index f8b3fb8..96d660c 100644
--- a/docs/_build/html/_static/jquery.js
+++ b/docs/_build/html/_static/jquery.js
@@ -11,7 +11,7 @@
  * Copyright 2011, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Sat Aug  4 06:33:40 UTC 2012
+ * Date: Thu Nov 15 18:28:24 BRST 2012
  */
 (function( window, undefined ) {
 
diff --git a/docs/_build/html/administration.html b/docs/_build/html/administration.html
index f5cd345..518d2a9 100644
--- a/docs/_build/html/administration.html
+++ b/docs/_build/html/administration.html
@@ -27,7 +27,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
     <link rel="next" title="Chimère import/export" href="import_export.html" />
-    <link rel="prev" title="Chimère customisation" href="customisation.html" /> 
+    <link rel="prev" title="Configuration" href="configuration.html" /> 
   </head>
   <body>
     <div class="related">
@@ -40,7 +40,7 @@
           <a href="import_export.html" title="Chimère import/export"
              accesskey="N">next</a> |</li>
         <li class="right" >
-          <a href="customisation.html" title="Chimère customisation"
+          <a href="configuration.html" title="Configuration"
              accesskey="P">previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
@@ -104,7 +104,7 @@ main page.</li>
 <li>search items by word (not available for all type of items)</li>
 <li>this filter box permit to filter current entries with some criteria (not
 available for all type of items)</li>
-<li>the header of the table is clickable. Click on an header sort the items by
+<li>the header of the table is cliquable. Click on an header sort the items by
 this header (ascending or descending). Multiple header sort is possible (the
 number on the right of the header explain the order of sorting).</li>
 <li>each item can be checked (for applying an action) or selected (by clicking on
@@ -126,34 +126,105 @@ item, they can be ordered by drag and drop.</li>
 self-explanatory.</li>
 </ol>
 </div>
+<div class="section" id="status">
+<h3>Status<a class="headerlink" href="#status" title="Permalink to this headline">¶</a></h3>
+<p><em>Status</em> is a property attached to each geographic item in Chimère. To
+administrate efficiently Chimère you need to understand the mean of each status.</p>
+<ul class="simple">
+<li><strong>Submited</strong>: Status of a new item freshly proposed by an end user. This item
+is not visible on the map.</li>
+<li><strong>Available</strong>: Status of an item visible on the map.</li>
+<li><strong>Disabled</strong>: Status of a discarded item.</li>
+<li><strong>Modified</strong>: Status of an amendment proposed by an end-user.</li>
+<li><strong>Imported</strong>: Status of a newly imported item. Import and export operations
+need that all items with <em>imported</em> status are treated (validated, disabled
+or deleted).</li>
+</ul>
+</div>
 </div>
-<div class="section" id="creating-news">
-<h2>Creating news<a class="headerlink" href="#creating-news" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="managing-news">
+<h2>Managing news<a class="headerlink" href="#managing-news" title="Permalink to this headline">¶</a></h2>
 <p>A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.</p>
+All you have to to do is to click on the <strong>Add</strong> button near News.
+For each news you have to provided a name and a content. The content can contain
+HTML tags.
+The availability is set with a checkbox.</p>
 </div>
 <div class="section" id="creating-categories-subcategories">
 <h2>Creating categories/subcategories<a class="headerlink" href="#creating-categories-subcategories" title="Permalink to this headline">¶</a></h2>
-<p>Before adding categories you have to set some icons. Theses icons appears on the map and in the categories&#8217; box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.</p>
-<p>Categories are in fact only containers for subcategories. You&#8217;ll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn&#8217;t it?)</p>
-<p>Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: &#8220;red&#8221;, &#8220;blue&#8221;, &#8220;yellow&#8221; or &#8220;purple&#8221;) otherwise you can put the HTML RVB code (for instance &#8220;#9227c9&#8221;).
-The element type is the type of element the subcategory can contain: POI, route or both.</p>
+<p>Before adding categories you have to set some icons. Theses icons appears on the
+map and in the categories&#8217; box on the main map.
+Be careful to resize correctly your icons. Indeed the icon will be presented at
+their real size on the map.
+To add icons: the <strong>Add</strong> button near Icons.</p>
+<p>Categories are in fact only containers for subcategories. You&#8217;ll have to provide
+only a name and an order.
+To add categories: the <strong>Add</strong> button near categories (quite clear now, isn&#8217;t
+it?)</p>
+<p>Fields of subcategories are: an associated category, a name, an icon, an order,
+a color and an element type.
+Theses fields are mainly quite self- explanatory.
+The color is used to draw routes (if this subcategory contains routes). If it a
+basic color it can be set with the English name (for instance: <em>red</em>, <em>blue</em>,
+<em>yellow</em> or <em>purple</em>) otherwise you can put the HTML RVB code (for instance
+<em>#9227c9</em>).
+The element type is the type of element the subcategory can contain: POI, route
+or both.</p>
 </div>
-<div class="section" id="moderation">
-<h2>Moderation<a class="headerlink" href="#moderation" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="edition-moderation-of-items">
+<h2>Edition/moderation of items<a class="headerlink" href="#edition-moderation-of-items" title="Permalink to this headline">¶</a></h2>
 <p>The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.</p>
+The moderator can access to all POIs (or routes) by clicking on them on the
+list.</p>
+<p>A search field is available to search by name but the more interesting is to
+filter POIs (or route) by state and by subcategory.</p>
+<p>There is a some actions available in the action list.</p>
+<ul class="simple">
+<li><strong>Delete</strong> to delete selected items. A confirmation step is displayed.</li>
+<li><strong>Validate</strong> to set the status <em>Available</em> to selected items.</li>
+<li><strong>Disable</strong> to set teh status <em>Disabled</em> to selected items. This is useful to
+keep items you don&#8217;t want to be exposed on the map.</li>
+<li><strong>Managed modified items</strong> to manage the amendment made by end users on the
+main site cf. to <a class="reference internal" href="#managing-modified"><em>Managing end user amendment</em></a>. Modified item has to be treated
+one by one.</li>
+<li><strong>Export to...</strong> to export selected item to the selected format.</li>
+</ul>
+<p>To modify an item, classically you have to click on his name.
+Then you access to a form to freely modify the item.
+In this form there is all data available to the end user form plus some extra
+fields. The <em>Import fields</em> only make sense with data imported from an external
+source or for data to be exported to OSM cf. to the <a class="reference internal" href="import_export.html#importing"><em>import section</em></a> of this documentation. <em>Associated items fields</em> are read only
+fields that list items associated to the current one (reference item of an
+amendment, associated file of a route).</p>
+<p>Associated multimedia items are at the bottom of the form. You can freely add,
+change items and change their order with drag and drop.</p>
+<p>Don&#8217;t forget to validate your change with one of the <strong>Save</strong> buttons at the
+bottom of the form (it is easily forgot when you change multimedia items).</p>
+<p>If an item is not relevant the <strong>Delete</strong> button permit to remove it.</p>
+</div>
+<div class="section" id="managing-end-user-amendment">
+<span id="managing-modified"></span><h2>Managing end user amendment<a class="headerlink" href="#managing-end-user-amendment" title="Permalink to this headline">¶</a></h2>
+<p>Amendment can be proposed on the main site by end-users.
+In Chimère an amendment is a new item with the status <em>Modified</em> and with a link
+to the reference item modified.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are logged as an administrator and make changes on the map with the
+end user form there will be directly validated.</p>
+</div>
+<p>A special form has been developed to facilitate the processing of theses
+modified items.</p>
+<p>You can access to this special form with the action <em>Managed modified items</em>.</p>
+<img alt="_images/chimere_admin_modified_management.png" src="_images/chimere_admin_modified_management.png" />
+<p>This form is a table with three columns.</p>
+<ol class="arabic simple">
+<li>The first column display the information for the reference item.</li>
+<li>The second column display the information proposed by the submitter.</li>
+<li>The third column is a list of checkboxes. For each row checked, after the
+validation, the value of the modified item will replace the value of the
+reference item.</li>
+</ol>
+<p>To reject all modification validate the form with no checkbox checked.</p>
 </div>
 </div>
 
@@ -171,18 +242,20 @@ If an item is not revelant the Delete button permit to remove it.</p>
 <li><a class="reference internal" href="#main-page">Main page</a></li>
 <li><a class="reference internal" href="#item-list">Item list</a></li>
 <li><a class="reference internal" href="#item-form">Item form</a></li>
+<li><a class="reference internal" href="#status">Status</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#creating-news">Creating news</a></li>
+<li><a class="reference internal" href="#managing-news">Managing news</a></li>
 <li><a class="reference internal" href="#creating-categories-subcategories">Creating categories/subcategories</a></li>
-<li><a class="reference internal" href="#moderation">Moderation</a></li>
+<li><a class="reference internal" href="#edition-moderation-of-items">Edition/moderation of items</a></li>
+<li><a class="reference internal" href="#managing-end-user-amendment">Managing end user amendment</a></li>
 </ul>
 </li>
 </ul>
 
   <h4>Previous topic</h4>
-  <p class="topless"><a href="customisation.html"
-                        title="previous chapter">Chimère customisation</a></p>
+  <p class="topless"><a href="configuration.html"
+                        title="previous chapter">Configuration</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="import_export.html"
                         title="next chapter">Chimère import/export</a></p>
@@ -218,7 +291,7 @@ If an item is not revelant the Delete button permit to remove it.</p>
           <a href="import_export.html" title="Chimère import/export"
              >next</a> |</li>
         <li class="right" >
-          <a href="customisation.html" title="Chimère customisation"
+          <a href="configuration.html" title="Configuration"
              >previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
diff --git a/docs/_build/html/configuration.html b/docs/_build/html/configuration.html
index 01ab81f..18966df 100644
--- a/docs/_build/html/configuration.html
+++ b/docs/_build/html/configuration.html
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
-    <link rel="next" title="Chimère customisation" href="customisation.html" />
+    <link rel="next" title="Administration" href="administration.html" />
     <link rel="prev" title="Upgrade" href="upgrade.html" /> 
   </head>
   <body>
@@ -37,7 +37,7 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="customisation.html" title="Chimère customisation"
+          <a href="administration.html" title="Administration"
              accesskey="N">next</a> |</li>
         <li class="right" >
           <a href="upgrade.html" title="Upgrade"
@@ -81,34 +81,49 @@ at the first paragraph of <a class="reference internal" href="administration.htm
 <p>To access theses pages you have to identify you with an account with <em>staff</em> and
 <em>superuser</em> status.</p>
 <p>A <em>superuser</em> account is created at the initialization of the database.</p>
+<div class="section" id="configuring-the-sites-framework">
+<h2>Configuring the sites framework<a class="headerlink" href="#configuring-the-sites-framework" title="Permalink to this headline">¶</a></h2>
+<p><em>Sites</em> 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 <em>Sites &gt; Sites</em>
+You only need to change <em>example.com</em> by your domain name. If you forgot to
+do that functionality such as RSS feeds will not work properly.</p>
+</div>
 <div class="section" id="managing-areas">
-<h2>Managing areas<a class="headerlink" href="#managing-areas" title="Permalink to this headline">¶</a></h2>
+<span id="id1"></span><h2>Managing areas<a class="headerlink" href="#managing-areas" title="Permalink to this headline">¶</a></h2>
 <p>An <em>Area</em> is the base of your map. It defines:</p>
 <ul class="simple">
 <li>a name: a human readable label for this area.</li>
+<li>an associated URN (<em>not mandatory</em>): the name of the area as a web ressource.
+In practice, if the area is not the default area the URN is used at the end of
+the default URL to access to this area. This is not mandatory but necessary
+for each area that is not the default one.</li>
 <li>a welcome message (<em>not mandatory</em>): this message is displayed once a day per
 user arriving on the map.</li>
-<li>a map bounding box: this is the default area to display when arriving on the
-map.</li>
-<li>restriction on the bounding box: if set to restricted, the end user can&#8217;t pan
-outside the defined bounding box.</li>
-<li>available layers (<em>not mandatory</em> OSM Mapnik is used by default): OSM Mapnik
-render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
-available by default. You can add new custom layer cf. <em class="xref std std-ref">managing-layers</em>.</li>
-<li>categories restriction (<em>not mandatory</em>): if no restriction is set all
-categories are available.</li>
+<li>an order (to sort areas).</li>
+<li>an availability.</li>
+<li>a default state. The /default/ area is viewed by default. Only one area can
+be the default: activating this state disable it on the possible other area
+with a default state.</li>
 <li>default checked categories (<em>not mandatory</em>).</li>
-<li>an external CSS file (<em>not mandatory</em>): an URL to an external CSS file.</li>
 <li>if categories are displayed dynamically (if dynamically is set, the end user
 only view categories witch have items on the map section the user currently
 see).</li>
-<li>an associated URN (<em>not mandatory</em>): the name of the area as a web ressource.
-In practice, if the area is not the default area the URN is used at the end of
-the default URL to access to this area. This is not mandatory but necessary
-for each area that is not the default one.</li>
+<li>categories restriction (<em>not mandatory</em>): if no restriction is set all
+categories are available.</li>
+<li>an external CSS file (<em>not mandatory</em>): an URL to an external CSS file.</li>
+<li>restriction on the bounding box: if set to restricted, the end user can&#8217;t pan
+outside the defined bounding box. Due to technical reasons, there is at this
+time no restriction on the zoom.</li>
+<li>a map bounding box: this is the area to display when arriving on the map. If
+the area is restricted it will be the bounding box that restrict the end user.
+Hold the control key, click and drag to draw the bounding box.</li>
+<li>available layers (<em>not mandatory</em> OSM Mapnik is used by default): OSM Mapnik
+render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
+available by default. You can add new custom layer cf. <a class="reference internal" href="customisation.html#managing-layers"><em>Managing layers</em></a>.</li>
 </ul>
 <p><em>Areas</em> are customizable directly on the web administration interface in
-<em>Chimere/Areas</em>.</p>
+<em>Chimere &gt; Areas</em>.</p>
 <p>As there is little chance that the default area is appropriate for you, you&#8217;ll
 have to set at least one default area.</p>
 <p>Adding many area can be a mean to show your map in different flavors.</p>
@@ -129,8 +144,8 @@ password):</p>
 <p>To create a new account, simply click on the Add button near Users. Give a name
 and a default password (the user can change it on in own later).</p>
 <p>Then complete the other pieces of information.</p>
-<p>Check the case: <em>Staff status</em> (or this user will not be able to log to
-the administration website).</p>
+<p>Check the case: <em>Staff status</em> (or this user will not be able to log to the
+administration website).</p>
 <p>If this account is a new technical administrator, check <em>Superuser status</em> (this
 user must be trustworthy!). Otherwise you&#8217;ll have to give permissions to this
 new user. It is easier to don&#8217;t add permission manually but make this user
@@ -229,16 +244,19 @@ model</em>).</p>
 <p>The administration page ask you for:</p>
 <ul class="simple">
 <li>a name,</li>
-<li>an order (to order between other properties),</li>
+<li>an order (to sort properties),</li>
 <li>an availability to the end user (this can be used to set hidden properties),</li>
 <li>a mandatory status,</li>
 <li>the categories the property applied to (if no categories selected it applied
 to all),</li>
 <li>the type: text, long text, password or date.</li>
 </ul>
-<p>To make this property available it is necessary to reload your webserver (the
+<p>To make this property available it is necessary to reload your web server (the
 property is cached).</p>
 <p>All forms are then automatically updated with this new field.</p>
+<p>If you don&#8217;t want to allow add and modification of properties you can disable
+this form by setting CHIMERE_HIDE_PROPERTYMODEL to <em>True</em> in your
+<em>local_settings.py</em> file.</p>
 </div>
 </div>
 
@@ -251,6 +269,7 @@ property is cached).</p>
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
 <li><a class="reference internal" href="#">Configuration</a><ul>
+<li><a class="reference internal" href="#configuring-the-sites-framework">Configuring the sites framework</a></li>
 <li><a class="reference internal" href="#managing-areas">Managing areas</a></li>
 <li><a class="reference internal" href="#managing-users">Managing users</a></li>
 <li><a class="reference internal" href="#creating-property-models">Creating property models</a></li>
@@ -262,8 +281,8 @@ property is cached).</p>
   <p class="topless"><a href="upgrade.html"
                         title="previous chapter">Upgrade</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="customisation.html"
-                        title="next chapter">Chimère customisation</a></p>
+  <p class="topless"><a href="administration.html"
+                        title="next chapter">Administration</a></p>
   <h3>This Page</h3>
   <ul class="this-page-menu">
     <li><a href="_sources/configuration.txt"
@@ -293,7 +312,7 @@ property is cached).</p>
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="customisation.html" title="Chimère customisation"
+          <a href="administration.html" title="Administration"
              >next</a> |</li>
         <li class="right" >
           <a href="upgrade.html" title="Upgrade"
diff --git a/docs/_build/html/customisation.html b/docs/_build/html/customisation.html
index 43faf84..1153c89 100644
--- a/docs/_build/html/customisation.html
+++ b/docs/_build/html/customisation.html
@@ -26,8 +26,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
-    <link rel="next" title="Administration" href="administration.html" />
-    <link rel="prev" title="Configuration" href="configuration.html" /> 
+    <link rel="prev" title="Chimère import/export" href="import_export.html" /> 
   </head>
   <body>
     <div class="related">
@@ -37,10 +36,7 @@
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
         <li class="right" >
-          <a href="administration.html" title="Administration"
-             accesskey="N">next</a> |</li>
-        <li class="right" >
-          <a href="configuration.html" title="Configuration"
+          <a href="import_export.html" title="Chimère import/export"
              accesskey="P">previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
@@ -67,13 +63,34 @@
 </table>
 <p>This documents presents the installation of Chimère.
 The version has been updated for version 2.0.0.</p>
-<div class="section" id="updating-the-design">
-<h2>Updating the design<a class="headerlink" href="#updating-the-design" title="Permalink to this headline">¶</a></h2>
-<p>You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.</p>
-<p>After this basic configuration done the harder is done. You can do now application administration tasks.</p>
+<div class="section" id="managing-layers">
+<span id="id1"></span><h2>Managing layers<a class="headerlink" href="#managing-layers" title="Permalink to this headline">¶</a></h2>
+<p>There is some different layers available by default in Chimère (OSM Mapnik, OSM
+Mapquest, OSM Transport map, OSM Cyclemap). You can add some extra layer using
+the web administration pages of Chimère. The new layer is defined with the
+appropriate <a class="reference external" href="http://openlayers.org/">Openlayers</a> JS code. This JS code must
+be a compatible Openlayers Layer instance with no ending semi-colon. For
+instance defining a Bing layer can be done with this kind of code:</p>
+<div class="highlight-python"><pre>new OpenLayers.Layer.Bing({
+            name: "Aerial",
+            key: "my-bing-API-key",
+            type: "Aerial"})</pre>
+</div>
+<p>Refer to the <a class="reference external" href="http://dev.openlayers.org/releases/OpenLayers-2.12/doc/apidocs/files/OpenLayers-js.html">Openlayers documentation API</a>
+for more details.</p>
 </div>
-<div class="section" id="id1">
-<h2>Managing layers<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="customizing-the-layout-and-the-design">
+<h2>Customizing the layout and the design<a class="headerlink" href="#customizing-the-layout-and-the-design" title="Permalink to this headline">¶</a></h2>
+<p>If you only want to customize the CSS, the easiest way to do it is to add a
+link to an extra CSS to your <em>Areas</em> cf. <a class="reference internal" href="configuration.html#managing-areas"><em>Managing areas</em></a>.</p>
+<p>If you want to do larger changes in the layout and the style the (well named)
+example_project can be customized to fit your needs. Each template file present
+in the <em>chimere/templates</em> directory can be copied in your <em>myproject/templates</em>
+directory and then modified.
+You only need to copy files that you want to modify. Theses files are in
+Django template language mainly made of pure HTML with some logic. Refer to
+the <a class="reference external" href="https://docs.djangoproject.com/en/1.4/ref/templates/">Django template documentation</a>
+for more details.</p>
 </div>
 </div>
 
@@ -86,18 +103,15 @@ The version has been updated for version 2.0.0.</p>
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
 <li><a class="reference internal" href="#">Chimère customisation</a><ul>
-<li><a class="reference internal" href="#updating-the-design">Updating the design</a></li>
-<li><a class="reference internal" href="#id1">Managing layers</a></li>
+<li><a class="reference internal" href="#managing-layers">Managing layers</a></li>
+<li><a class="reference internal" href="#customizing-the-layout-and-the-design">Customizing the layout and the design</a></li>
 </ul>
 </li>
 </ul>
 
   <h4>Previous topic</h4>
-  <p class="topless"><a href="configuration.html"
-                        title="previous chapter">Configuration</a></p>
-  <h4>Next topic</h4>
-  <p class="topless"><a href="administration.html"
-                        title="next chapter">Administration</a></p>
+  <p class="topless"><a href="import_export.html"
+                        title="previous chapter">Chimère import/export</a></p>
   <h3>This Page</h3>
   <ul class="this-page-menu">
     <li><a href="_sources/customisation.txt"
@@ -127,10 +141,7 @@ The version has been updated for version 2.0.0.</p>
           <a href="genindex.html" title="General Index"
              >index</a></li>
         <li class="right" >
-          <a href="administration.html" title="Administration"
-             >next</a> |</li>
-        <li class="right" >
-          <a href="configuration.html" title="Configuration"
+          <a href="import_export.html" title="Chimère import/export"
              >previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
diff --git a/docs/_build/html/import_export.html b/docs/_build/html/import_export.html
index a12fd22..2772c8e 100644
--- a/docs/_build/html/import_export.html
+++ b/docs/_build/html/import_export.html
@@ -26,7 +26,8 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
-    <link rel="prev" title="Chimère customisation" href="customisation.html" /> 
+    <link rel="next" title="Chimère customisation" href="customisation.html" />
+    <link rel="prev" title="Administration" href="administration.html" /> 
   </head>
   <body>
     <div class="related">
@@ -37,6 +38,9 @@
              accesskey="I">index</a></li>
         <li class="right" >
           <a href="customisation.html" title="Chimère customisation"
+             accesskey="N">next</a> |</li>
+        <li class="right" >
+          <a href="administration.html" title="Administration"
              accesskey="P">previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
@@ -63,6 +67,9 @@
 </table>
 <p>This documents presents the administration of Chimère.
 The version has been updated for version 2.0.0.</p>
+<div class="section" id="importing">
+<span id="id1"></span><h2>Importing<a class="headerlink" href="#importing" title="Permalink to this headline">¶</a></h2>
+</div>
 </div>
 
 
@@ -71,9 +78,20 @@ The version has been updated for version 2.0.0.</p>
       </div>
       <div class="sphinxsidebar">
         <div class="sphinxsidebarwrapper">
+  <h3><a href="index.html">Table Of Contents</a></h3>
+  <ul>
+<li><a class="reference internal" href="#">Chimère import/export</a><ul>
+<li><a class="reference internal" href="#importing">Importing</a></li>
+</ul>
+</li>
+</ul>
+
   <h4>Previous topic</h4>
+  <p class="topless"><a href="administration.html"
+                        title="previous chapter">Administration</a></p>
+  <h4>Next topic</h4>
   <p class="topless"><a href="customisation.html"
-                        title="previous chapter">Chimère customisation</a></p>
+                        title="next chapter">Chimère customisation</a></p>
   <h3>This Page</h3>
   <ul class="this-page-menu">
     <li><a href="_sources/import_export.txt"
@@ -104,6 +122,9 @@ The version has been updated for version 2.0.0.</p>
              >index</a></li>
         <li class="right" >
           <a href="customisation.html" title="Chimère customisation"
+             >next</a> |</li>
+        <li class="right" >
+          <a href="administration.html" title="Administration"
              >previous</a> |</li>
         <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li> 
       </ul>
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
index 8b4ca6d..75d01c2 100644
--- a/docs/_build/html/index.html
+++ b/docs/_build/html/index.html
@@ -70,24 +70,29 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="configuration.html#configuring-the-sites-framework">Configuring the sites framework</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration.html#managing-areas">Managing areas</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration.html#managing-users">Managing users</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration.html#creating-property-models">Creating property models</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="customisation.html">Chimère customisation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="customisation.html#updating-the-design">Updating the design</a></li>
-<li class="toctree-l2"><a class="reference internal" href="customisation.html#id1">Managing layers</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="administration.html">Administration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="administration.html#administration-pages-presentation">Administration pages presentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#creating-news">Creating news</a></li>
+<li class="toctree-l2"><a class="reference internal" href="administration.html#managing-news">Managing news</a></li>
 <li class="toctree-l2"><a class="reference internal" href="administration.html#creating-categories-subcategories">Creating categories/subcategories</a></li>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#moderation">Moderation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="administration.html#edition-moderation-of-items">Edition/moderation of items</a></li>
+<li class="toctree-l2"><a class="reference internal" href="administration.html#managing-end-user-amendment">Managing end user amendment</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="import_export.html">Chimère import/export</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="import_export.html#importing">Importing</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="customisation.html">Chimère customisation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="customisation.html#managing-layers">Managing layers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="customisation.html#customizing-the-layout-and-the-design">Customizing the layout and the design</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="import_export.html">Chimère import/export</a></li>
 </ul>
 </div>
 </div>
diff --git a/docs/_build/html/install.html b/docs/_build/html/install.html
index 6f74a04..2c0ea7f 100644
--- a/docs/_build/html/install.html
+++ b/docs/_build/html/install.html
@@ -118,7 +118,7 @@ Linux distribution repositories. For instance on Debian Wheezy:</p>
     python-pyexiv2 python-feedparser javascript-common</pre>
 </div>
 <p>On Debian Squeeze (you need to activate backports):</p>
-<div class="highlight-python"><pre>apt-get install -t squeeze-backports python-django
+<div class="highlight-python"><pre>apt-get install -t squeeze-backports python-django libjs-jquery
 
 apt-get install python python-django-south python-beautifulsoup tinymce \
     apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \
@@ -307,6 +307,12 @@ mkdir /var/log/apache2/chimere/</pre>
 <div class="highlight-python"><pre>a2ensite chimere
 /etc/init.d/apache2 reload</pre>
 </div>
+<p>If you encounter problem with the upload of files with Unicode chars in their
+names activate the appropriate locale in Apache. On a Debian server with UTF-8
+as default encoding in the file <em>/etc/apache2/envvars</em> uncomment the following
+line:</p>
+<div class="highlight-python"><pre>. /etc/default/locale</pre>
+</div>
 </div>
 </div>
 </div>
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
index 7a41eb7..d0161af 100644
--- a/docs/_build/html/objects.inv
+++ b/docs/_build/html/objects.inv
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
index 1cdf783..e21926c 100644
--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{all:[1,3,6],code:[1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:6,follow:[1,6,4],feedpars:[1,4],content:3,depend:[2,1,4],zone:4,readabl:[6,4],base_url:[],send:4,easiest:[],init:4,program:[],titl:3,text:6,larg:4,town:[],sourc:[2,1,4],string:[1,4],createsuperus:6,relev:4,administr:[0,2,3,4,5,6],button:[6,3],list:[3,4],geograph:[6,4],item:[6,3],form:[6,3],quick:[],initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,design:[0,2],download:4,further:1,myusernam:4,click:[6,3],blue:3,index:[],appear:3,compar:3,section:6,multimedia:6,abl:6,beautifulsoup:4,access:[6,3],delet:[6,3],version:[0,1,2,3,4,5,6],"new":[2,1,3,6,4],net:[1,4],chimer:[1,3,6,4],chose:[],createdb:4,french:4,"005k":1,witch:6,address:[],path:[6,3,4],modifi:[6,3,4],sinc:4,interpret:[],box:[6,3],search:3,host:[],prior:[],permit:[6,3],action:3,template_context_processor:[],chang:[1,3,6,4],chanc:6,environn:1,chimere_tag:1,repositori:[1,4],father:[],modul:[],apt:[1,4],vim:[1,4],put:3,authentifi:3,subcategori:[2,6,3],fake:1,marker:1,instal:[0,1,6,4,2],select:[6,3],from:[1,3,4],would:[1,4],univers:4,upgrad:[2,1],next:1,websit:[6,4],few:[6,3],handler:[],usr:[1,4],criteria:3,type:[6,3,4],more:[6,3,4],sort:3,where_is_your_chimer:3,desir:4,share:4,relat:4,server_url:1,customis:[0,1,2],phone:6,"export":[2,5],indic:[],particular:4,recommand:4,unpack:4,cach:[2,1,6],must:[1,3,6,4],psql:4,"static":[0,1,4],account:[6,3,4],word:3,hour:6,prepar:1,work:[1,3],uniqu:4,soup:4,paragraph:[1,6],can:[0,1,3,6,4],lc_messag:4,default_categori:[],root:4,prompt:4,tar:4,give:6,process:1,sudo:[],smtp:4,templat:[2,1,4],tarbal:1,tag:[3,4],want:[6,4],default_cent:[],mapnik:6,lxml:[1,4],end:[6,3],anoth:4,length:[1,4],write:[],verifi:1,simpl:[6,3],css:[0,6],email_host:4,map:[6,3],product:1,rebas:1,pypi:4,clone:[1,4],after:[0,1],superus:6,upload:1,manuali:[],befor:[1,3],plane:1,beauti:4,date:[0,1,3,4,5,6],multipl:3,data:[1,4],"short":4,practic:6,bind:1,postgi:4,lost:1,stash:1,django:[1,6,4],issu:[],inform:6,environ:[1,6],jquery_js_url:4,allow:[],order:[6,3],checkbox:3,move:[1,4],becaus:[1,4],meter:1,through:[],tinymce_url:4,still:4,mainli:3,dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:4,psycopg2:4,clickabl:3,better:4,window:[],requir:[1,6],where_is_chimer:4,media_root:[],hidden:[6,3],main:3,extra_url:[],changepassword:6,them:[1,3,4],recal:[],thei:[6,3],python:[1,4],dai:6,initi:[1,6,4],nov:4,now:[0,1,3,4],choic:[],name:[1,3,6,4],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],off:[],drop:3,refresh:1,xvjf:4,html2text:4,each:[6,3],found:4,unicod:4,updat:[0,1,2,3,4,5,6],mean:6,compil:[2,4],replac:4,jquery_url:1,hard:[],procedur:4,realli:[],backport:[1,4],extract:4,special:[1,4],out:3,variabl:[1,6,4],won:1,tinymc:4,publish:[1,3],categori:[2,6,3],adapt:[1,4],modpython:[],correct:[1,4],red:3,common:[1,4],postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[1,4],free:4,base:[6,4],ask:6,org:[1,4],"9227c9":3,mychimer:[1,6],unpredict:4,gdal:[1,4],care:[3,4],spatial_ref_si:4,could:1,area:[2,6],static_url:1,database_host:[],filter:3,perhap:1,isn:3,outsid:6,root_urlconf:[1,4],auth:6,south:[1,4],first:[1,3,6,4],feed:4,major:1,suffix:[],render:6,feel:4,onc:[6,3],number:[1,3,6,4],yourself:3,restrict:6,mai:6,instruct:1,alreadi:4,done:[0,1,6,4],least:[1,6,4],mydjango:4,owner:4,stabl:[1,4],installed_app:1,optionali:4,size:3,differ:6,"long":6,district:[],script:1,associ:[6,3],top:[],mkdir:[1,4],system:3,messag:6,chimere_dynamic_categori:[],master:1,conveni:3,option:1,copi:[1,4],install_path:4,part:4,consult:3,detail_cont:[],haven:1,png:[],serv:1,provid:[3,4],remov:[1,3],project:[2,1,6,4],pythoninterpret:[],ressourc:6,database_password:[],transport:6,browser:[2,1],favorit:4,ani:[1,4],packag:[1,4],manner:[],have:[1,3,6,4],tabl:[3,4],need:4,element:3,pg_version:4,plpgsql:4,local_set:[1,4],engin:[],bz2:4,min:1,rout:[6,3],port:[],also:[1,3],etienn:[],take:4,which:[],default_data:4,simplifi:1,map_lay:[],sethandl:[],usernam:6,choos:4,most:[6,3,4],letter:[1,4],deploi:[],geodjango:4,icon:[1,3,6],time_zon:4,don:[1,3,6,4],url:[1,3,6,4],doc:[],clear:3,later:[1,6],flow:[],your_chimere_path:1,inde:3,database_port:[],pythonhandl:[],left:[],fact:3,wsgi:[1,4],show:6,german:[],visitor:[2,1],database_us:[],directli:6,session:6,loaddata:4,secret_kei:4,permiss:[6,4],cryptograph:4,staff:6,celeri:[1,4],current:[1,3,6],onli:[1,3,6,4],locat:1,execut:1,copyright:[0,1,3,4,5,6],explain:3,configur:[0,1,6,4,2],apach:[1,4],should:[1,4],theme:6,simpliest:4,local:[1,6,4],media_url:[],contribut:[1,4],get:[2,1,4],familiar:6,your_local_nam:1,stop:1,blank:3,wheezi:[1,4],a2ensit:4,report:1,geo:4,restart:1,enabl:1,chimere_localnam:[1,6],reload:[6,4],integr:1,contain:3,where:6,explainatori:3,view:6,set:[1,3,6,4],project_nam:4,"chim\u00e8r":[0,1,2,3,4,5,6],knowledg:1,displai:[6,3],see:[6,3],mandatori:[6,3],epsg_display_project:[],concern:3,jqueri:[1,4],statu:6,avaibl:3,correctli:3,databas:[2,1,6,4],someth:4,cours:[0,4],label:[6,3],state:3,epsg_project:[],between:[1,6],"import":[2,1,6,4,5],experi:1,email:4,accord:4,javascript:[1,4],appreci:4,kei:4,postgresql_psycopg2:[],job:[],here:4,purpl:3,addit:4,cyclemap:6,both:3,last:4,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[1,3,4],forgotten:6,freeli:3,login:3,whole:[],load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,littl:6,poi:3,mapquest:6,mod_python:[],backend:[],quit:3,folow:1,come:3,empti:[],example_project:[1,4],json:4,valu:[1,4],interest:[6,3],basic:[0,1,3,6],popul:4,createlang:4,regroup:4,imag:4,present:[0,2,3,4,5,6],"case":6,chimere_path:[1,6],look:[6,3],vanilla:[],properti:[2,1,6],harder:0,easier:6,trick:1,defin:6,error:1,value_of_your_localnam:1,fixtur:4,compilemessag:[1,4],openstreetmap:[],real:3,layer:[0,6,2],customiz:6,libj:[1,4],"\u00e9tienn":[0,1,3,4,5,6],site:[3,4],destin:4,archiv:4,conf:4,sever:1,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[1,6],exchang:[],same:[3,4],member:6,html:3,descend:3,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,6,4],effect:3,solut:4,moment:[],user:[2,1,6,4],mani:[1,3,6],extern:6,rvb:3,posgi:4,recent:3,pwprompt:4,task:[0,6],moder:[2,6,3],center:[],chimere_app_path:[1,6],entri:3,well:4,exampl:4,thi:[0,1,3,4,5,6],english:3,model:[2,1,6],self:3,piec:6,propos:6,explan:[],identifi:[6,3],just:[0,1,4],mypassword:[],obtain:4,activ:[1,4],insid:[6,3],human:6,touch:[1,4],flavor:6,yet:1,languag:[2,4],web:[2,1,6],easi:1,"53k":4,shortcut:3,apache2:4,identif:3,add:[1,3,6],other:6,appli:[1,3,6],apart:[],explanatori:3,match:[],bin:[1,4],applic:[0,6,3,4],format:[],read:3,database_engin:[],database_nam:[],password:[6,3],mod:4,linux:[1,4],insert:[],like:[1,3,6,4],specif:4,mychimere_project:4,unidecod:4,property_i_j:[],zoom:[],staticfil:1,server:[1,4],edit:[0,1,3,4],necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[2,6,3],two:6,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,creation:4,some:[1,3,4],begin:[1,4],revel:3,sampl:[1,4],language_cod:4,home:[],librari:4,distribut:4,lead:3,bottom:[],makemessag:4,definit:[],per:6,libapache2:4,evolv:[],leav:[],proj:4,slash:3,localhost:[],refer:4,core:[],previou:1,run:1,bold:3,chimere_default_cent:[],usag:6,step:[1,3,6],squeez:[1,4],prerequisit:[2,4],wget:4,trustworthi:6,sub:3,postgresql:4,chimere_restricted_ext:[],column:3,eventuali:[],manag:[0,1,6,4,2],srv:[1,6],stand:4,backup:1,ratatouil:[],own:[0,6],addus:4,setenv:[],additionn:[],pythonpath:[],encod:4,bound:6,automat:6,appropri:[6,4],been:[0,1,3,4,5,6],contrib:[1,4],openlay:[],your:[0,1,3,6,4],libgeo:4,accordingli:4,git:[1,4],fill:[],lwpostgi:[],wai:4,pictur:6,lok:[0,1,3,4,5,6],secret:4,submit:[3,4],custom:[0,6,4,2],avail:[1,3,6,4],interfac:[6,3],"var":[1,4],submiss:3,particulari:[],properli:[],administration_:[],simplejson:[1,4],forc:[2,1],ascend:3,back:3,pwd:1,collectstat:[1,4],link:3,translat:[2,1,4],pyexiv2:[1,4],line:1,congratul:4,pull:1,made:[1,3],possibl:3,"default":[1,6,4],checkout:[1,4],chimere_default_categori:[],pythondebug:[],rc2:[],rc3:1,below:4,limit:6,otherwis:[6,3],problem:1,urn:6,crosstrack:1,gone:[],creat:[2,1,3,6,4],createus:4,parser:4,exist:4,rule:[1,4],file:[0,1,6,4],syncdb:[1,4],chimere_default_zoom:[],check:[6,3,4],probabl:1,echo:4,encrypt:4,automaticali:[],todo:4,when:6,detail:[6,3],gettext:4,field:[1,3,6,4],old:1,valid:3,kombu:1,branch:[1,4],chimere_admin_01:[],test:1,you:[0,1,3,6,4],draw:3,repeat:1,peacefrog:[1,4],symbol:[],drag:3,log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longer:[],migrate_properti:1,directori:[1,4],root_path:[],descript:[1,6,4],dgango:[],chown:[1,4],time:4},objtypes:{},titles:["Chim\u00e8re customisation","Upgrade","Welcome to Chim\u00e8re&#8217;s documentation!","Administration","Installation","Chim\u00e8re import/export","Configuration"],objnames:{},filenames:["customisation","upgrade","index","administration","install","import_export","configuration"]})
\ No newline at end of file
+Search.setIndex({objects:{},terms:{all:[1,3,6],code:[0,1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:[0,6,3],follow:[1,6,4],feedpars:[1,4],row:3,content:[6,3],hold:6,depend:[2,1,4],zone:4,readabl:[6,4],base_url:[],send:4,easiest:0,init:4,program:[],titl:3,text:6,sens:3,town:[],sourc:[2,1,3,4],string:[1,4],createsuperus:6,relev:[3,4],administr:[0,2,3,4,5,6],button:[6,3],list:[3,4],geograph:[6,3,4],item:[2,6,3],form:[6,3],quick:[],initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,second:3,design:[0,2],download:4,further:1,myusernam:4,click:[6,3],blue:3,index:[],appear:3,compar:[],section:[6,3],multimedia:[6,3],abl:6,beautifulsoup:4,access:[6,3],delet:[6,3],version:[0,1,2,3,4,5,6],"new":[0,1,2,3,4,6],net:[1,4],chimer:[0,1,3,6,4],chose:[],createdb:4,french:4,"005k":1,witch:6,address:[],path:[6,3,4],modifi:[0,6,3,4],sinc:4,interpret:[],box:[6,3],search:3,larger:0,host:[],prior:[],permit:[6,3],action:3,template_context_processor:[],chang:[0,1,3,6,4],apart:[],chanc:6,environn:1,chimere_tag:1,repositori:[1,4],extra:[0,3],father:[],modul:[],apt:[1,4],vim:[1,4],put:3,authentifi:3,subcategori:[2,6,3],fake:1,marker:1,instal:[0,1,6,4,2],select:[6,3],from:[1,3,4],would:[1,4],univers:4,upgrad:[2,1],next:1,websit:[6,4],few:[6,3],handler:[],usr:[1,4],criteria:3,type:[0,6,3,4],more:[0,6,3,4],sort:[6,3],where_is_your_chimer:3,desir:4,mypassword:[],share:4,relat:4,server_url:1,customis:[0,1,2],phone:6,"export":[2,3,5],indic:[],particular:4,recommand:4,unpack:4,cach:[2,1,6],must:[0,1,6,4],psql:4,"static":[1,4],account:[6,3,4],word:3,hour:6,prepar:1,work:[1,3,6],uniqu:[6,4],soup:4,paragraph:[1,6],can:[0,1,3,6,4],lc_messag:4,default_categori:[],root:4,control:6,prompt:4,tar:4,give:6,process:[1,3],sudo:[],smtp:4,templat:[0,1,4,2],tarbal:1,tag:[3,4],want:[0,6,3,4],default_cent:[],spe:[],mapnik:[0,6],lxml:[1,4],end:[0,6,3,2],freshli:3,anoth:4,length:[1,4],write:[],pure:0,reject:3,verifi:1,simpl:[6,3],css:[0,6],email_host:4,map:[0,6,3],product:1,rebas:1,pypi:4,clone:[1,4],after:[1,3],superus:6,upload:[1,4],manuali:[],befor:[1,3],plane:1,beauti:4,date:[0,1,3,4,5,6],multipl:3,data:[1,3,4],"short":4,practic:6,third:3,bind:1,bing:0,postgi:4,lost:1,stash:1,django:[0,1,6,4],issu:[],inform:[6,3],environ:[1,6],jquery_js_url:4,allow:6,order:[6,3],oper:3,checkbox:3,move:[1,4],becaus:[1,4],meter:1,through:[],addus:4,tinymce_url:4,still:4,mainli:[0,3],dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:[0,4],psycopg2:4,clickabl:[],better:4,window:[],requir:[1,6],where_is_chimer:4,media_root:[],hidden:[6,3],main:3,extra_url:[],changepassword:6,them:[1,3,4],recal:[],thei:[6,3],python:[1,4],dai:6,initi:[1,6,4],framework:[2,6],facilit:3,nov:4,now:[1,3,4],choic:[],name:[0,1,3,6,4],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],off:[],drop:3,refresh:1,easili:3,xvjf:4,html2text:4,each:[0,6,3],found:4,unicod:4,updat:[0,1,2,3,4,5,6],mean:[6,3],compil:[2,4],domain:6,replac:[3,4],jquery_url:1,hard:[],procedur:4,realli:[],backport:[1,4],forgot:[6,3],extract:4,special:[1,3,4],out:3,variabl:[1,6,4],won:1,tinymc:4,newli:3,publish:1,categori:[2,6,3],adapt:[1,4],modpython:[],ref:[],correct:[1,4],red:3,common:[1,4],postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[1,4],free:4,reason:6,base:[6,4],ask:6,org:[1,4],"9227c9":3,mychimer:[1,6],unpredict:4,gdal:[1,4],care:[3,4],spatial_ref_si:4,could:1,area:[0,6,2],static_url:1,keep:3,filter:3,perhap:1,isn:3,outsid:6,root_urlconf:[1,4],auth:6,south:[1,4],first:[1,3,6,4],feed:[6,4],teh:3,major:1,suffix:[],render:6,feel:4,onc:[6,3],number:[1,3,6,4],yourself:3,restrict:6,mai:6,instruct:1,alreadi:4,done:[0,1,6,4],least:[1,6,4],mydjango:4,owner:4,stabl:[1,4],installed_app:1,optionali:4,size:3,differ:[0,6],"long":6,district:[],script:1,associ:[6,3],top:[],mkdir:[1,4],system:3,messag:6,attach:3,chimere_dynamic_categori:[],cliquabl:3,master:1,conveni:3,option:1,copi:[0,1,4],install_path:4,part:4,consult:3,detail_cont:[],haven:1,png:[],rss:6,serv:[1,6],kind:0,provid:[3,4],remov:[1,3],project:[2,1,6,4],pythoninterpret:[],ressourc:6,database_password:[],other:6,browser:[2,1],favorit:4,ani:[1,4],myproject:0,packag:[1,4],manner:[],have:[1,3,6,4],tabl:[3,4],need:[0,6,3,4],element:3,pg_version:4,plpgsql:4,local_set:[1,6,4],engin:[],bz2:4,min:1,rout:[6,3],port:[],note:3,also:[1,3],etienn:[],take:4,which:[],librari:4,default_data:4,simplifi:1,map_lay:[],sethandl:[],usernam:6,choos:4,most:[6,3,4],larg:4,letter:[1,4],deploi:[],geodjango:4,icon:[1,3,6],time_zon:4,don:[1,3,6,4],url:[1,3,6,4],doc:[],clear:3,later:[1,6],flow:[],your_chimere_path:1,inde:3,database_port:[],pythonhandl:[],left:[],fact:3,visibl:3,wsgi:[1,4],show:6,german:[],visitor:[2,1],database_us:[],directli:[6,3],session:6,loaddata:4,secret_kei:4,permiss:[6,4],cryptograph:4,staff:6,celeri:[1,4],current:[1,3,6],onli:[0,1,3,6,4],locat:1,execut:1,copyright:[0,1,3,4,5,6],explain:3,configur:[2,1,6,4],apach:[1,4],should:[1,4],theme:6,simpliest:4,local:[1,6,4],media_url:[],contribut:[1,4],get:[2,1,4],familiar:6,your_local_nam:1,stop:1,blank:3,wheezi:[1,4],a2ensit:4,report:1,geo:4,restart:1,layout:[0,2],enabl:1,specif:4,chimere_localnam:[1,6],reload:[6,4],integr:1,contain:3,where:6,explainatori:[],view:6,set:[1,3,6,4],project_nam:4,"chim\u00e8r":[0,1,2,3,4,5,6],knowledg:1,displai:[6,3],see:[6,3],mandatori:[6,3],epsg_display_project:[],concern:3,jqueri:[1,4],statu:[6,3],avaibl:[],correctli:3,databas:[2,1,6,4],someth:4,cours:4,label:[6,3],state:[6,3],epsg_project:[],between:1,"import":[2,1,3,4,5,6],experi:1,email:4,accord:4,javascript:[1,4],appreci:4,kei:[0,6,4],postgresql_psycopg2:[],job:[],here:4,purpl:3,addit:4,cyclemap:[0,6],both:3,last:4,expos:3,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[0,1,3,4],forgotten:6,freeli:3,login:3,com:6,load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,colon:0,littl:6,poi:3,mapquest:[0,6],mod_python:[],backend:[],quit:3,folow:1,come:3,due:6,empti:[],example_project:[0,1,4],json:4,valu:[1,3,4],administration_:[],modif:[6,3],popul:4,createlang:4,regroup:4,imag:4,understand:3,present:[0,2,3,4,5,6],"case":6,chimere_path:[1,6],look:[6,3],amend:[2,3],vanilla:[],properti:[2,1,3,6],harder:[],easier:6,trick:1,defin:[0,6],error:1,value_of_your_localnam:1,envvar:4,fixtur:4,compilemessag:[1,4],openstreetmap:[],real:3,layer:[0,6,2],customiz:6,libj:[1,4],"\u00e9tienn":[0,1,3,4,5,6],site:[2,6,3,4],destin:4,archiv:4,uncom:4,conf:4,sever:1,develop:3,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[1,3,6],exchang:[],same:[6,3,4],member:6,html:[0,3],descend:3,compat:0,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,4],logic:0,effect:3,solut:4,moment:[],user:[2,1,3,6,4],mani:[1,3,6],extern:[6,3],rvb:3,posgi:4,recent:3,pwprompt:4,task:6,moder:[2,6,3],center:[],chimere_app_path:[1,6],entri:3,well:[0,4],exampl:[6,4],thi:[0,1,3,4,5,6],english:3,model:[2,1,6],self:3,piec:6,propos:[6,3],explan:[],identifi:[6,3],just:[1,4],chimere_hide_propertymodel:6,obtain:4,activ:[1,6,4],insid:[6,3],human:6,touch:[1,4],flavor:6,yet:1,languag:[0,4,2],web:[0,1,6,2],easi:1,field:[1,3,6,4],particulari:[],"53k":4,shortcut:3,apache2:4,identif:3,add:[0,1,3,6],setenv:[],appli:[1,3,6],save:3,explanatori:3,match:[],bin:[1,4],applic:[6,3,4],format:3,read:3,database_engin:[],database_nam:[],password:[6,3],mod:4,linux:[1,4],insert:[],like:[1,3,6,4],semi:0,mychimere_project:4,unidecod:4,property_i_j:[],zoom:6,staticfil:1,server:[1,6,4],edit:[2,1,3,4],api:0,necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[0,6,3,2],two:6,encount:4,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,creation:4,some:[0,1,3,4],begin:[1,4],revel:[],sampl:[1,4],language_cod:4,home:[],transport:[0,6],distribut:4,lead:3,confirm:3,makemessag:4,definit:[],per:6,whole:[],libapache2:4,evolv:[],leav:[],proj:4,slash:3,three:3,localhost:[],refer:[0,3,4],core:[],plu:3,previou:1,run:1,bold:3,chimere_default_cent:[],usag:6,step:[1,3,6],squeez:[1,4],prerequisit:[2,4],wget:4,trustworthi:6,sub:3,postgresql:4,chimere_restricted_ext:[],column:3,eventuali:[],manag:[0,1,2,3,4,6],srv:[1,6],stand:4,discard:3,backup:1,disabl:[6,3],ratatouil:[],own:6,effici:3,additionn:[],pythonpath:[],submitt:3,encod:4,bound:6,automat:6,appropri:[0,6,4],been:[0,1,3,4,5,6],contrib:[1,4],openlay:0,your:[0,1,3,6,4],libgeo:4,accordingli:4,git:[1,4],fill:[],lwpostgi:[],wai:[0,4],pictur:6,lok:[0,1,3,4,5,6],secret:4,submit:[3,4],custom:[0,6,4,2],avail:[0,1,3,6,4],interfac:6,"var":[1,4],submiss:[],treat:3,"function":6,properli:6,interest:[6,3],simplejson:[1,4],forc:[2,1],ascend:3,basic:[1,3,6],back:3,pwd:1,collectstat:[1,4],link:[0,3],translat:[2,1,4],pyexiv2:[1,4],line:[1,4],"true":6,congratul:4,pull:1,made:[0,1,3],utf:4,possibl:[6,3],createus:4,checkout:[1,4],chimere_default_categori:[],pythondebug:[],rc2:[],rc3:1,below:4,limit:6,otherwis:[6,3],problem:[1,4],urn:6,crosstrack:1,gone:[],aerial:0,creat:[2,1,3,6,4],classic:3,parser:4,"char":4,exist:4,rule:[1,4],file:[0,1,3,6,4],syncdb:[1,4],chimere_default_zoom:[],check:[6,3,4],probabl:[1,6],echo:4,encrypt:4,automaticali:[],todo:4,when:[6,3],detail:[0,6,3],gettext:4,"default":[0,1,6,4],old:1,valid:3,kombu:1,branch:[1,4],chimere_admin_01:[],test:1,you:[0,1,3,6,4],draw:[6,3],repeat:1,peacefrog:[1,4],symbol:[],bottom:3,drag:[6,3],database_host:[],log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longer:[],migrate_properti:1,directori:[0,1,4],root_path:[],descript:[1,6,4],dgango:[],chown:[1,4],time:[6,4]},objtypes:{},titles:["Chim\u00e8re customisation","Upgrade","Welcome to Chim\u00e8re&#8217;s documentation!","Administration","Installation","Chim\u00e8re import/export","Configuration"],objnames:{},filenames:["customisation","upgrade","index","administration","install","import_export","configuration"]})
\ No newline at end of file
diff --git a/docs/_build/html/upgrade.html b/docs/_build/html/upgrade.html
index 2304c83..37ac898 100644
--- a/docs/_build/html/upgrade.html
+++ b/docs/_build/html/upgrade.html
@@ -92,7 +92,7 @@ If you are considering to contribute on Chimère get the Git master.</p>
 Then install the new dependencies:</p>
 <div class="highlight-python"><pre>apt-get install -t squeeze-backports python-django python-django-south \
                    python-simplejson libjs-jquery-ui python-pyexiv2 \
-                   python-feedparser javascript-common</pre>
+                   python-feedparser javascript-common libjs-jquery</pre>
 </div>
 </div>
 <div class="section" id="debian-wheezy">
diff --git a/docs/_static/chimere_admin_modified_management.png b/docs/_static/chimere_admin_modified_management.png
new file mode 100644
index 0000000..84e069e
--- /dev/null
+++ b/docs/_static/chimere_admin_modified_management.png
diff --git a/docs/administration.rst b/docs/administration.rst
index 75d8761..2f8ddb5 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -60,7 +60,7 @@ Item list
 #. search items by word (not available for all type of items)
 #. this filter box permit to filter current entries with some criteria (not
    available for all type of items)
-#. the header of the table is clickable. Click on an header sort the items by
+#. the header of the table is cliquable. Click on an header sort the items by
    this header (ascending or descending). Multiple header sort is possible (the
    number on the right of the header explain the order of sorting).
 #. each item can be checked (for applying an action) or selected (by clicking on
@@ -81,36 +81,120 @@ Item form
 #. the form has to be validated by one of theses actions buttons. They are
    self-explanatory.
 
+Status
+******
+
+*Status* is a property attached to each geographic item in Chimère. To
+administrate efficiently Chimère you need to understand the mean of each status.
+
+- **Submited**: Status of a new item freshly proposed by an end user. This item
+  is not visible on the map.
+- **Available**: Status of an item visible on the map.
+- **Disabled**: Status of a discarded item.
+- **Modified**: Status of an amendment proposed by an end-user.
+- **Imported**: Status of a newly imported item. Import and export operations
+  need that all items with *imported* status are treated (validated, disabled
+  or deleted).
+
+
 Managing news
 -------------
 
 A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.
+All you have to to do is to click on the **Add** button near News.
+For each news you have to provided a name and a content. The content can contain
+HTML tags.
+The availability is set with a checkbox.
 
 Creating categories/subcategories
 ---------------------------------
 
-Before adding categories you have to set some icons. Theses icons appears on the map and in the categories' box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.
+Before adding categories you have to set some icons. Theses icons appears on the
+map and in the categories' box on the main map.
+Be careful to resize correctly your icons. Indeed the icon will be presented at
+their real size on the map.
+To add icons: the **Add** button near Icons.
+
+Categories are in fact only containers for subcategories. You'll have to provide
+only a name and an order.
+To add categories: the **Add** button near categories (quite clear now, isn't
+it?)
+
+Fields of subcategories are: an associated category, a name, an icon, an order,
+a color and an element type.
+Theses fields are mainly quite self- explanatory.
+The color is used to draw routes (if this subcategory contains routes). If it a
+basic color it can be set with the English name (for instance: *red*, *blue*,
+*yellow* or *purple*) otherwise you can put the HTML RVB code (for instance
+*#9227c9*).
+The element type is the type of element the subcategory can contain: POI, route
+or both.
+
+Edition/moderation of items
+---------------------------
+
+The moderation step is quite simple. It works the same with POIs and routes.
+The moderator can access to all POIs (or routes) by clicking on them on the
+list.
 
-Categories are in fact only containers for subcategories. You'll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn't it?)
+A search field is available to search by name but the more interesting is to
+filter POIs (or route) by state and by subcategory.
 
-Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: "red", "blue", "yellow" or "purple") otherwise you can put the HTML RVB code (for instance "#9227c9").
-The element type is the type of element the subcategory can contain: POI, route or both.
+There is a some actions available in the action list.
 
-Moderation
-----------
+- **Delete** to delete selected items. A confirmation step is displayed.
+- **Validate** to set the status *Available* to selected items.
+- **Disable** to set teh status *Disabled* to selected items. This is useful to
+  keep items you don't want to be exposed on the map.
+- **Managed modified items** to manage the amendment made by end users on the
+  main site cf. to :ref:`managing-modified`. Modified item has to be treated
+  one by one.
+- **Export to...** to export selected item to the selected format.
 
-The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.
 
+To modify an item, classically you have to click on his name.
+Then you access to a form to freely modify the item.
+In this form there is all data available to the end user form plus some extra
+fields. The *Import fields* only make sense with data imported from an external
+source or for data to be exported to OSM cf. to the :ref:`import section
+<importing>` of this documentation. *Associated items fields* are read only
+fields that list items associated to the current one (reference item of an
+amendment, associated file of a route).
+
+Associated multimedia items are at the bottom of the form. You can freely add,
+change items and change their order with drag and drop.
+
+Don't forget to validate your change with one of the **Save** buttons at the
+bottom of the form (it is easily forgot when you change multimedia items).
+
+If an item is not relevant the **Delete** button permit to remove it.
+
+.. _managing-modified:
+
+Managing end user amendment
+---------------------------
+
+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.
+
+.. Note::
+   If you are logged as an administrator and make changes on the map with the
+   end user form there will be directly validated.
+
+A special form has been developed to facilitate the processing of theses
+modified items.
+
+You can access to this special form with the action *Managed modified items*.
+
+.. image:: _static/chimere_admin_modified_management.png
+
+This form is a table with three columns.
+
+#. The first column display the information for the reference item.
+#. The second column display the information proposed by the submitter.
+#. The third column is a list of checkboxes. For each row checked, after the
+   validation, the value of the modified item will replace the value of the
+   reference item.
+
+To reject all modification validate the form with no checkbox checked.
diff --git a/docs/configuration.rst b/docs/configuration.rst
index f8bed2b..0565509 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -33,6 +33,16 @@ To access theses pages you have to identify you 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 forgot to
+do that functionality such as RSS feeds will not work properly.
+
+.. _managing-areas:
 
 Managing areas
 --------------
@@ -40,29 +50,36 @@ Managing areas
 An *Area* is the base of your map. It defines:
 
 * a name: a human readable label for this area.
+* an associated URN (*not mandatory*): the name of the area as a web ressource.
+  In practice, if the area is not the default area the URN is used at the end of
+  the default URL to access to this area. This is not mandatory but necessary
+  for each area that is not the default one.
 * a welcome message (*not mandatory*): this message is displayed once a day per
   user arriving on the map.
-* a map bounding box: this is the default area to display when arriving on the
-  map.
-* restriction on the bounding box: if set to restricted, the end user can't pan
-  outside the defined bounding box.
-* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
-  render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
-  available by default. You can add new custom layer cf. :ref:`managing-layers`.
-* categories restriction (*not mandatory*): if no restriction is set all
-  categories are available.
+* an order (to sort areas).
+* an availability.
+* a default state. The /default/ area is viewed by default. Only one area can
+  be the default: activating this state disable it on the possible other area
+  with a default state.
 * default checked categories (*not mandatory*).
-* an external CSS file (*not mandatory*): an URL to an external CSS file.
 * if categories are displayed dynamically (if dynamically is set, the end user
   only view categories witch have items on the map section the user currently
   see).
-* an associated URN (*not mandatory*): the name of the area as a web ressource.
-  In practice, if the area is not the default area the URN is used at the end of
-  the default URL to access to this area. This is not mandatory but necessary
-  for each area that is not the default one.
+* categories restriction (*not mandatory*): if no restriction is set all
+  categories are available.
+* an external CSS file (*not mandatory*): an URL to an external CSS file.
+* restriction on the bounding box: if set to restricted, the end user can't pan
+  outside the defined bounding box. Due to technical reasons, there is at this
+  time no restriction on the zoom.
+* a map bounding box: this is the area to display when arriving on the map. If
+  the area is restricted it will be the bounding box that restrict the end user.
+  Hold the control key, click and drag to draw the bounding box.
+* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
+  render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
+  available by default. You can add new custom layer cf. :ref:`managing-layers`.
 
 *Areas* are customizable directly on the web administration interface in
-*Chimere/Areas*.
+*Chimere > Areas*.
 
 As there is little chance that the default area is appropriate for you, you'll
 have to set at least one default area.
@@ -92,8 +109,8 @@ and a default password (the user can change it on in own later).
 
 Then complete the other pieces of information.
 
-Check the case: *Staff status* (or this user will not be able to log to
-the administration website).
+Check the case: *Staff status* (or this user will not be able to log to the
+administration website).
 
 If this account is a new technical administrator, check *Superuser status* (this
 user must be trustworthy!). Otherwise you'll have to give permissions to this
@@ -151,15 +168,19 @@ model*).
 The administration page ask you for:
 
 * a name,
-* an order (to order between other properties),
+* an order (to sort properties),
 * an availability to the end user (this can be used to set hidden properties),
 * a mandatory status,
 * the categories the property applied to (if no categories selected it applied
   to all),
 * the type: text, long text, password or date.
 
-To make this property available it is necessary to reload your webserver (the
+To make this property available it is necessary to reload your web server (the
 property is cached).
 
 All forms are then automatically updated with this new field.
 
+If you don't want to allow add and modification of properties you can disable
+this form by setting CHIMERE_HIDE_PROPERTYMODEL to *True* in your
+*local_settings.py* file.
+
diff --git a/docs/customisation.rst b/docs/customisation.rst
index e27be01..19002dc 100644
--- a/docs/customisation.rst
+++ b/docs/customisation.rst
@@ -12,13 +12,41 @@ This documents presents the installation of Chimère.
 The version has been updated for version 2.0.0.
 
 
-Updating the design
--------------------
-
-You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.
-
-After this basic configuration done the harder is done. You can do now application administration tasks.
-
 .. _managing-layers:
+
 Managing layers
 ---------------
+
+There is some different layers available by default in Chimère (OSM Mapnik, OSM
+Mapquest, OSM Transport map, OSM Cyclemap). You can add some extra layer using
+the web administration pages of Chimère. The new layer is defined with the
+appropriate `Openlayers <http://openlayers.org/>`_ JS code. This JS code must
+be a compatible Openlayers Layer instance with no ending semi-colon. For
+instance defining a Bing layer can be done with this kind of code::
+
+    new OpenLayers.Layer.Bing({
+                name: "Aerial",
+                key: "my-bing-API-key",
+                type: "Aerial"})
+
+
+Refer to the `Openlayers documentation API
+<http://dev.openlayers.org/releases/OpenLayers-2.12/doc/apidocs/files/OpenLayers-js.html>`_
+for more details.
+
+
+Customizing the layout and the design
+-------------------------------------
+
+If you only want to customize the CSS, the easiest way to do it is to add a
+link to an extra CSS to your *Areas* cf. :ref:`managing-areas`.
+
+If you want to do larger changes in the layout and the style the (well named)
+example_project can be customized to fit your needs. Each template file present
+in the *chimere/templates* directory can be copied in your *myproject/templates*
+directory and then modified.
+You only need to copy files that you want to modify. Theses files are in
+Django template language mainly made of pure HTML with some logic. Refer to
+the `Django template documentation <https://docs.djangoproject.com/en/1.4/ref/templates/>`_
+for more details.
+
diff --git a/docs/import_export.rst b/docs/import_export.rst
index 890a644..3d4b0ed 100644
--- a/docs/import_export.rst
+++ b/docs/import_export.rst
@@ -11,4 +11,7 @@ Chimère import/export
 This documents presents the administration of Chimère.
 The version has been updated for version 2.0.0.
 
+.. _importing:
 
+Importing
+---------
diff --git a/docs/index.rst b/docs/index.rst
index 45f40e0..ee1dd6f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,6 +12,6 @@ Welcome to Chimère's documentation!
    install
    upgrade
    configuration
-   customisation
    administration
    import_export
+   customisation