summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/_build/html/_sources/administration.txt4
-rw-r--r--docs/_build/html/_sources/import_export.txt25
-rw-r--r--docs/_build/html/_sources/install.txt7
-rw-r--r--docs/_build/html/_sources/upgrade.txt48
-rw-r--r--docs/_build/html/administration.html4
-rw-r--r--docs/_build/html/import_export.html22
-rw-r--r--docs/_build/html/index.html2
-rw-r--r--docs/_build/html/install.html10
-rw-r--r--docs/_build/html/objects.invbin375 -> 375 bytes
-rw-r--r--docs/_build/html/searchindex.js2
-rw-r--r--docs/_build/html/upgrade.html58
-rw-r--r--docs/administration.rst4
-rw-r--r--docs/install.rst7
-rw-r--r--docs/upgrade.rst48
14 files changed, 156 insertions, 85 deletions
diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt
index 92b6442..672caa9 100644
--- a/docs/_build/html/_sources/administration.txt
+++ b/docs/_build/html/_sources/administration.txt
@@ -197,7 +197,7 @@ 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.
+This form is a table with three columns:
#. The first column displays the information for the reference item,
#. The second column displays the information proposed by the submitter,
@@ -206,4 +206,4 @@ This form is a table with three columns.
reference item.
.. Note::
- To reject all modification validate the form with no checkbox checked.
+ To reject all modifications validate the form with no checkbox checked.
diff --git a/docs/_build/html/_sources/import_export.txt b/docs/_build/html/_sources/import_export.txt
index eb581ce..bc422b1 100644
--- a/docs/_build/html/_sources/import_export.txt
+++ b/docs/_build/html/_sources/import_export.txt
@@ -137,6 +137,16 @@ the **Import** action and validate.
The import should be processing normally. If not, an explicit error message
should be printed in the state column of your import.
+You can also launch imports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command::
+
+ ./manage.py chimere_import <import_id>
+
+- *import_id* is the import ID
+
+If you launch the command without *import_id* the list of imports available is
+presented and you can choose one.
+
Managing imported data
**********************
@@ -159,6 +169,21 @@ Directly from the :ref:`geographic items list <geographic-items-management>` you
can export to the chosen format. All you have to do is to select the desired
items, choose the appropriate action in the action list and validate.
+You can also launch exports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command::
+
+ ./manage.py chimere_export <subcategory_id> <CSV|KML|SHP> \
+ <marker|route> <filename>
+
+- *subcategory_id* is the ID of the chosen subcategory
+- *CSV|KML|SHP* is the chosen format
+- *marker|route* is to get marker or route
+- *filename* is the output filename
+
+If you launch the command without arguments you will be prompted for the choice
+to make for your export.
+
+
Export to OSM
*************
diff --git a/docs/_build/html/_sources/install.txt b/docs/_build/html/_sources/install.txt
index 248ece9..02aeb42 100644
--- a/docs/_build/html/_sources/install.txt
+++ b/docs/_build/html/_sources/install.txt
@@ -95,6 +95,9 @@ the paths accordingly to your needs)::
Installing the sources
**********************
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
+
Choose a path to install your Chimère::
INSTALL_PATH=/var/local/django
@@ -123,10 +126,10 @@ readable directory::
tar xvjf chimere-last.tar.bz2
chown -R myusername:www-data chimere
-From the git repository
+From the Git repository
+++++++++++++++++++++++
-Another solution is to get it from the git repository::
+Another solution is to get it from the Git repository::
cd $INSTALL_PATH
git clone git://www.peacefrogs.net/git/chimere
diff --git a/docs/_build/html/_sources/upgrade.txt b/docs/_build/html/_sources/upgrade.txt
index 796ed98..377e5e7 100644
--- a/docs/_build/html/_sources/upgrade.txt
+++ b/docs/_build/html/_sources/upgrade.txt
@@ -11,20 +11,24 @@ Upgrade
This document presents the upgrade of Chimère.
It has been updated for version 2.0.0.
-Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
+.. Warning::
+ Before any upgrade backup the database and all your installation files
+ (specially if you have made changes to them).
+
The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (>2.0)
-of Chimère.
+*not* an easy process. A work is currently done to easy the upgrade in later
+versions (>2.0) of Chimère.
-If several versions has been published, you should repeat any upgrading steps.
+If several versions have been published, you should repeat all upgrading steps.
For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
to v2.0. The only optional step is the integration of your customisations.
The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.
-The instruction are given for Debian Squeeze and Debian Wheezy.
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
+
+The instructions are given for Debian Squeeze and Debian Wheezy.
Getting new versions of dependencies
@@ -57,7 +61,7 @@ Debian Wheezy
apt-get install python-django-south python-simplejson libjs-jquery-ui \
python-pyexiv2 python-feedparser javascript-common
-If you are planing to do major import consider the install of `Celery
+If you are planning to do major import consider the install of `Celery
<http://celeryproject.org/>`_.
.. code-block:: bash
@@ -67,8 +71,8 @@ If you are planing to do major import consider the install of `Celery
Getting the new sources
-----------------------
-First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
+First of all you have to get the new version of the source code.
+For the upgrade process, the source code has to be from the Git
repository.
To simplify further instructions, some environment variables are
@@ -82,10 +86,10 @@ initialized.
CHIMERE_TAG=master # version 2.0 -> master
CHIMERE_LOCALNAME=mychimere
-Your local name is used for the name of your local git branch and the Python
+Your local name is used for the name of your local Git branch and the Python
package. As a Python package it should follow the rule of Python variable name:
it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
+underscores ("_") to any length. Don't begin the name by "_" because it has special
significance in Python.
From a previous Git installation
@@ -94,7 +98,7 @@ From a previous Git installation
.. code-block:: bash
cd $CHIMERE_PATH
- git checkout -b $CHIMERE_LOCALNAME # do it only if you haven't yet create a local branch
+ git checkout -b $CHIMERE_LOCALNAME # only if you haven't created yet a local branch
git stash # if you have uncommited changes
git checkout master
git pull
@@ -104,7 +108,7 @@ From a previous Git installation
From a previous tarball installation
************************************
-First remove your old installation and get the Git version.
+First remove your old installation and get the Git version:
.. code-block:: bash
@@ -128,7 +132,7 @@ Version 1.1 -> 1.2
CHIMERE_APP_PATH=$CHIMERE_PATH/chimere
vim $CHIMERE_APP_PATH/settings.py
-Add the line (adapted for your jquery and gpsbabel installation).
+Add the line (adapted for your jquery and gpsbabel installation):
.. code-block:: python
@@ -142,7 +146,7 @@ Version 1.2 -> 2.0
Project template
................
-Create a new project template.
+Create a new project template:
.. code-block:: bash
@@ -177,14 +181,14 @@ Logging is now enabled by default in the file */var/log/django/chimere.log*.
Static files
............
-Now static file are managed with *django.contrib.staticfiles*.
+Now static files are managed with *django.contrib.staticfiles*.
.. code-block:: bash
cd $CHIMERE_APP_PATH
./manage.py collectstatic
-Move old static files to the new static directory.
+Move old static files to the new static directory:
.. code-block:: bash
@@ -260,7 +264,7 @@ values of an old *Property model* to this new field, a script is available.
cd $CHIMERE_APP_PATH
../chimere/scripts/migrate_properties.py
- # folow the instructions
+ # follow the instructions
From 2.0 to master
******************
@@ -290,10 +294,10 @@ Version 1.2 -> 2.0 -> master
cd $CHIMERE_PATH/chimere
django-admin compilemessages
-Forcing the upgrade of visitor's web browser cache
+Forcing the refresh of visitor's web browser cache
--------------------------------------------------
-If major changes in the javascript has be done between version, many of your
+If major changes in the javascript has been done between versions, many of your
users could experience problems. There are many tricks to force the refresh
of their cache. One of them is to change the location of statics files. To do
that edit your local_settings.py and change::
@@ -304,7 +308,7 @@ to::
STATIC_URL = '/static/v2.0.0/'
-Then in the static directory.
+Then in the static directory:
.. code-block:: bash
diff --git a/docs/_build/html/administration.html b/docs/_build/html/administration.html
index 8dff6e6..ff93f78 100644
--- a/docs/_build/html/administration.html
+++ b/docs/_build/html/administration.html
@@ -218,7 +218,7 @@ end user form they will be directly validated.</p>
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>
+<p>This form is a table with three columns:</p>
<ol class="arabic simple">
<li>The first column displays the information for the reference item,</li>
<li>The second column displays the information proposed by the submitter,</li>
@@ -228,7 +228,7 @@ reference item.</li>
</ol>
<div class="admonition note">
<p class="first admonition-title">Note</p>
-<p class="last">To reject all modification validate the form with no checkbox checked.</p>
+<p class="last">To reject all modifications validate the form with no checkbox checked.</p>
</div>
</div>
</div>
diff --git a/docs/_build/html/import_export.html b/docs/_build/html/import_export.html
index 5a0dcd4..2e9045b 100644
--- a/docs/_build/html/import_export.html
+++ b/docs/_build/html/import_export.html
@@ -174,6 +174,15 @@ You have to hit this button before validating the form.</li>
the <strong>Import</strong> action and validate.</p>
<p>The import should be processing normally. If not, an explicit error message
should be printed in the state column of your import.</p>
+<p>You can also launch imports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command:</p>
+<div class="highlight-python"><pre>./manage.py chimere_import &lt;import_id&gt;</pre>
+</div>
+<ul class="simple">
+<li><em>import_id</em> is the import ID</li>
+</ul>
+<p>If you launch the command without <em>import_id</em> the list of imports available is
+presented and you can choose one.</p>
</div>
<div class="section" id="managing-imported-data">
<h3>Managing imported data<a class="headerlink" href="#managing-imported-data" title="Permalink to this headline">¶</a></h3>
@@ -195,6 +204,19 @@ is particularly important if you want to export your data to OSM.</p>
<p>Directly from the <a class="reference internal" href="fr/administration.html#geographic-items-management"><em>geographic items list</em></a> you
can export to the chosen format. All you have to do is to select the desired
items, choose the appropriate action in the action list and validate.</p>
+<p>You can also launch exports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command:</p>
+<div class="highlight-python"><pre>./manage.py chimere_export &lt;subcategory_id&gt; &lt;CSV|KML|SHP&gt; \
+ &lt;marker|route&gt; &lt;filename&gt;</pre>
+</div>
+<ul class="simple">
+<li><em>subcategory_id</em> is the ID of the chosen subcategory</li>
+<li><em>CSV|KML|SHP</em> is the chosen format</li>
+<li><em>marker|route</em> is to get marker or route</li>
+<li><em>filename</em> is the output filename</li>
+</ul>
+<p>If you launch the command without arguments you will be prompted for the choice
+to make for your export.</p>
</div>
<div class="section" id="export-to-osm">
<h3>Export to OSM<a class="headerlink" href="#export-to-osm" title="Permalink to this headline">¶</a></h3>
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
index 1747ece..d4fbf15 100644
--- a/docs/_build/html/index.html
+++ b/docs/_build/html/index.html
@@ -63,7 +63,7 @@
<li class="toctree-l2"><a class="reference internal" href="upgrade.html#getting-the-new-sources">Getting the new sources</a></li>
<li class="toctree-l2"><a class="reference internal" href="upgrade.html#migrate-database">Migrate database</a></li>
<li class="toctree-l2"><a class="reference internal" href="upgrade.html#update-translations">Update translations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#forcing-the-upgrade-of-visitor-s-web-browser-cache">Forcing the upgrade of visitor&#8217;s web browser cache</a></li>
+<li class="toctree-l2"><a class="reference internal" href="upgrade.html#forcing-the-refresh-of-visitor-s-web-browser-cache">Forcing the refresh of visitor&#8217;s web browser cache</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
diff --git a/docs/_build/html/install.html b/docs/_build/html/install.html
index 6aaf672..15ba3bd 100644
--- a/docs/_build/html/install.html
+++ b/docs/_build/html/install.html
@@ -145,6 +145,10 @@ psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial
</div>
<div class="section" id="installing-the-sources">
<h2>Installing the sources<a class="headerlink" href="#installing-the-sources" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are considering to contribute on Chimère get the Git master.</p>
+</div>
<p>Choose a path to install your Chimère:</p>
<div class="highlight-python"><pre>INSTALL_PATH=/var/local/django
mkdir $INSTALL_PATH</pre>
@@ -171,8 +175,8 @@ chown -R myusername:www-data chimere</pre>
</div>
</div>
<div class="section" id="from-the-git-repository">
-<h3>From the git repository<a class="headerlink" href="#from-the-git-repository" title="Permalink to this headline">¶</a></h3>
-<p>Another solution is to get it from the git repository:</p>
+<h3>From the Git repository<a class="headerlink" href="#from-the-git-repository" title="Permalink to this headline">¶</a></h3>
+<p>Another solution is to get it from the Git repository:</p>
<div class="highlight-python"><pre>cd $INSTALL_PATH
git clone git://www.peacefrogs.net/git/chimere
cd chimere
@@ -331,7 +335,7 @@ line:</p>
<li><a class="reference internal" href="#database-configuration">Database configuration</a></li>
<li><a class="reference internal" href="#installing-the-sources">Installing the sources</a><ul>
<li><a class="reference internal" href="#from-an-archive">From an archive</a></li>
-<li><a class="reference internal" href="#from-the-git-repository">From the git repository</a></li>
+<li><a class="reference internal" href="#from-the-git-repository">From the Git repository</a></li>
</ul>
</li>
<li><a class="reference internal" href="#creating-a-custom-project-template">Creating a custom project template</a></li>
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
index 85f3dfc..58b4ee0 100644
--- a/docs/_build/html/objects.inv
+++ b/docs/_build/html/objects.inv
Binary files differ
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
index 55c5904..1649736 100644
--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{all:[6,2,4,7],code:[0,1,2,4,5,8],forget:[2,4],rentrer:1,"d\u00e9j\u00e0":1,wsgi:[1,2,5],yellow:4,signific:[2,5],osm:[8,0,7,4,6],conteneur:8,abil:6,fourni:[1,8],"\u00e9tape":8,redimensionn:8,row:4,votr:1,categori:[3,7,4,6],utilisateur:[1,8],hold:7,depend:[3,2,5,6],backup:2,zone:5,donner:8,"mani\u00e8r":[1,8],xapi:6,specif:[6,5],send:5,easiest:0,init:[1,5],revenir:8,visitor:[3,2],sens:4,"r\u00e9f\u00e9rez":1,"\u00e9quival":1,valeur:[1,8],"apr\u00e8":8,sourc:[3,1,2,4,5,6,8],string:[2,5],prendr:1,"valid\u00e9":8,parfoi:8,util:8,plusieur:8,mechan:6,veri:6,garder:8,voir:8,relev:[6,4,5],tri:8,"\u00e9cart\u00e9":8,administr:[0,1,3,4,5,6,7,8],button:[6,7,4],list:[6,1,8,4,5],geograph:[6,7,4,5],"pr\u00e9sentat":8,"try":6,item:[3,7,4,6],checkout:[1,2,5],courriel:1,signif:1,loaddata:[1,5],"proc\u00e9dur":1,"initialis\u00e9":1,initialis:[3,1,2,7,5],dir:[1,5],osgeo:1,teh:[],version:[0,1,2,3,4,5,6,7,8],"sp\u00e9cifiqu":8,"derni\u00e8r":1,sync:6,sign:5,second:[8,4],droit:8,design:[0,6,3],follow:[2,7,5],download:[1,5],further:2,myusernam:[1,5],click:[7,4],append:6,integr:2,blue:[8,4],what:6,lettr:1,appear:4,feedpars:[1,2,5],section:[8,7,4],multimedia:[7,4],abl:7,quelqu:[1,8],overload:6,"\u00e9l\u00e9ment":8,current:[2,4,7],delet:[6,7,4],simpliest:5,sur:[1,8],effectif:8,peuvent:8,"new":[0,2,3,4,5,6,7],net:[1,2,5],fuseau:1,cela:[1,8],celeri:[1,2,5],administrateur:[1,8],chose:1,"d\u00e9compressez":1,createdb:[1,5],supprim:8,here:[6,5],georss:6,"005k":2,modif:[8,7,4],free:5,"\u00e9tait":1,address:6,ver:[1,8],modifi:[0,4,5,6,7,8],sinc:5,valu:[6,2,4,5],"m\u00eame":[1,8],box:[6,7,4],search:4,larger:0,envoy:1,later:[2,7],permit:[7,4],action:[6,8,4],chang:[0,2,4,5,6,7],changer:8,chanc:7,environn:2,"mod\u00e9rateur":8,"d\u00e9sir\u00e9":1,repositori:[2,5],extra:[0,4],appli:[2,4,7],modul:[1,5],"syst\u00e8m":8,apt:[1,2,5],vim:[1,2,5],postgi:[1,5],api:[0,6],subcategori:[3,7,4,6],visibl:[6,8,4],marker:2,instal:[3,1,2,5,7,8],"cr\u00e9ation":1,select:[6,7,4],from:[6,2,4,5],patron:1,zip:6,univers:[1,5],upgrad:[3,2],next:2,websit:[7,5],few:[7,4],usr:[1,2,5],criteria:4,"\u00eate":8,"r\u00e9ell":8,assez:8,type:[0,1,4,5,6,7,8],more:[0,7,4,5,6],sort:[7,4],ensuit:[1,8],where_is_your_chimer:[8,4],desir:[6,5],filtrer:8,"utilis\u00e9":[1,8],relat:5,commencez:1,server_url:2,fonction:1,site:[3,1,4,5,7,8],warn:[6,8],parlent:8,migrate_properti:2,templat:[0,2,5,3],aux:[1,8],moin:1,recommand:5,unpack:5,cach:[3,2,7],"rattach\u00e9":8,must:[0,2,7,5],psql:[1,5],account:[6,7,4,5],word:4,sometim:6,hour:7,trouvent:1,car:1,prepar:2,work:[2,4,7],uniqu:[6,1,7,5],pour:[1,8],soup:[1,5],"g\u00e9rer":8,modifiez:1,can:[0,2,4,5,6,7],lc_messag:[1,5],meet:6,"g\u00e9rez":1,root:[1,5],obliqu:8,control:7,abord:[1,8],prompt:5,tar:[1,5],give:7,process:[6,2,4],requi:1,share:[1,5],accept:6,listent:8,bienvenu:1,tag:[6,1,4,5],want:[0,7,4,5,6],tarbal:2,suivant:1,"ent\u00eat":8,mapnik:[0,7],alwai:6,lxml:[1,2,5],end:[8,0,7,4,3],freshli:4,anoth:[4,5],restart:2,tableau:8,rapport:1,clair:8,pure:0,reject:4,instead:6,csv:6,simpl:[8,6,1,7,4],css:[0,1,7,5],email_host:[1,5],map:[0,7,4,6],product:2,rebas:2,mess:6,clone:[1,2,5],after:[6,2,4],minimum:1,superus:7,upload:[2,5],befor:[6,2,4],cours:5,sinon:8,attent:8,date:[0,1,2,4,5,6,7,8],multipl:4,underscor:5,classiqu:8,associ:[6,7,4],"ic\u00f4n":8,"h\u00e9sitez":1,projet:1,permet:8,practic:7,third:4,read:4,bind:2,bing:0,explicit:6,avant:8,"acc\u00e9der":8,django:[0,1,2,7,5],issu:6,inform:[8,6,1,7,4],mainten:[1,8],environ:[2,7],allow:7,media:[1,2,5],sont:[1,8],"biblioth\u00e8qu":1,order:[6,7,4],origin:6,checkbox:[6,4],creation:[8,5],help:6,bien:[1,8],apparaiss:8,"gliss\u00e9":8,becaus:[6,2,5],peut:[1,8],"int\u00e9r\u00eat":8,installez:1,own:7,addus:[1,5],tinymce_url:[1,5],nombr:[1,8],mainli:[0,4],dynam:7,paramet:5,member:7,style:0,group:7,"pr\u00e9sent\u00e9":8,fit:[0,5],chosen:6,psycopg2:[1,5],changement:8,clickabl:4,better:[1,5],platform:6,pend:6,eux:8,where_is_chimer:[1,5],suffit:1,"op\u00e9rat":8,hidden:[7,4],main:[6,4],fin:8,"g\u00e9n\u00e9ralement":8,descend:4,nom:[1,8],them:[6,2,4,5],haven:2,thei:[7,4],python:[1,2,5],encod:[1,5],dan:[1,8],taill:8,handi:6,"suppl\u00e9mentair":[1,8],number:[6,2,4,7,5],framework:[3,7],cet:8,autr:[1,8],optionnel:1,verifi:2,nov:[1,5],now:[2,4,5],regroupez:1,trajet:8,"bas\u00e9":1,choic:6,document:[0,1,2,3,4,5,6,7,8],"r\u00e9agenc\u00e9":8,trac:1,unidecod:[1,5],edit:[3,2,4,5],aucun:8,drop:4,refresh:[6,2],easili:[6,4],localis:6,"import\u00e9":8,each:[0,7,4,6],"fran\u00e7ai":1,found:5,smtp:[1,5],updat:[0,2,3,4,5,6,7],mean:[6,7,4],compil:[3,1,5],dispon:[1,8],domain:7,"int\u00e9rieur":8,replac:[4,5],lign:[1,8],mydjango:[1,5],procedur:5,realli:6,"cr\u00e9er":[1,8],local_set:[1,2,7,5],"static":[1,2,5],forgot:7,"cr\u00e9ez":1,"identifi\u00e9":8,dispos:8,"probl\u00e8m":1,special:[2,4,5],out:4,variabl:[1,2,7,5],"cl\u00e9":1,optionali:5,newli:[6,4],publish:2,content:[6,7,4],contenu:8,backport:[1,2,5],adapt:[2,5],print:6,got:6,correct:[6,1,2,5],red:[8,4],serveur:1,postgr:[1,5],ascendant:8,"propos\u00e9":8,insid:[7,4],line:[2,5],migrat:[3,1,2,5],precaut:2,given:[6,2,5],cart:8,standard:6,reason:7,base:[6,1,7,8,5],que:[1,8],put:[6,4],org:[1,2],"9227c9":[8,4],mychimer:[2,7],unpredict:5,gdal:[1,2,5],care:[6,4,5],contient:8,spatial_ref_si:[1,5],wai:[0,5,6],launch:6,"caract\u00e8r":1,could:[6,2],area:[0,7,6,3],ask:[6,7],static_url:2,keep:[6,4],filter:[6,4],length:[2,5],trier:8,place:1,isn:4,outsid:7,geometri:6,lancer:1,think:6,south:[1,2,5],first:[6,2,4,7,5],oper:4,pleas:5,major:2,initial:1,beauti:[1,5],directli:[6,7,4],"troisi\u00e8m":8,feel:5,onc:[6,7,4],"pr\u00e9":1,"pr\u00e8":8,barr:8,yourself:4,restrict:7,mai:[1,7,8],instruct:2,alreadi:5,done:[0,2,7,5,6],least:[2,7,5],blank:4,owner:[1,5],stabl:[1,2,5],installed_app:2,tinymc:[1,5],ont:[1,8],size:4,differ:[0,7],lister:1,fonctionn:8,boit:8,script:2,avec:[1,8],licens:6,mkdir:[1,2,5],system:4,messag:[6,7],tou:8,avez:[1,8],attach:4,master:2,"appropri\u00e9":1,traduct:1,proposit:8,conveni:[6,4],"final":6,store:6,"\u00e9t\u00e9":[1,8],conduit:8,pare:8,ainsi:8,"trac\u00e9":8,copi:[0,2,5],install_path:[1,5],plane:2,direct:[2,8],recherch:8,"short":5,court:1,"\u00e9galement":8,consult:[8,4],vide:8,"n\u00e9cessit":[1,8],than:6,rss:7,serv:[2,7],kind:0,"compl\u00e9t\u00e9":1,provid:[6,4,5],remov:[2,4],satisfair:1,cli:[2,7],plupart:[1,8],project:[3,2,7,5,6],ressourc:7,gestion:[1,8],initi:[2,7,5],browser:[3,2],latitud:6,"param\u00e9trag":1,"acc\u00e8":8,favorit:5,tiret:1,beforehand:6,ani:[6,2,5],correspond:1,myproject:0,packag:[2,5],"g\u00e9ographiqu":[1,8],faut:1,stash:2,have:[6,2,4,7,5],tabl:[8,1,4,5],need:[0,7,4,5,6],seem:6,element:4,pg_version:[1,5],plpgsql:[1,5],option:2,raccourci:8,suivr:1,bz2:[1,5],"\u00e9ventuel":8,min:2,rout:[7,4],"d\u00e9connexion":8,note:[6,8,4],also:[2,4],witch:7,take:5,obligatoir:8,roug:8,librari:[1,5],default_data:[1,5],"r\u00e9pertoir":1,compat:0,begin:[2,5],sure:6,distribut:[1,5],trace:6,normal:6,usernam:[6,7],object:6,"acc\u00e8d":8,createus:[1,5],doit:[1,8],most:[7,4,5],render:7,"\u00e9tat":8,compt:[1,8],remplacez:1,"g\u00e9r\u00e9":1,geodjango:[1,5],why:6,dai:7,sub:4,doivent:8,time_zon:[1,5],don:[6,2,4,7,5],refract:1,url:[1,2,4,5,6,7],clear:4,"\u00e9ditez":1,openlay:0,pwd:2,inde:4,"g\u00e9r\u00e9e":8,part:5,determin:6,databas:[3,1,2,5,6,7],efficac:8,"r\u00e9cemment":8,came:6,son:8,"n\u00e9cessair":[1,8],show:7,text:7,ajout:8,conserv:8,beautifulsoup:[1,5],session:7,particularli:6,permiss:[1,7,5],contenir:8,"compos\u00e9":8,data:[6,1,2,4,5],find:6,"multim\u00e9dia":8,chimer:[0,1,2,4,5,6,7,8],fichier:[1,8],onli:[0,2,4,5,6,7],submit:[4,5],locat:2,execut:2,copyright:[0,1,2,4,5,6,7,8],"pr\u00e9f\u00e9r\u00e9e":1,explain:4,configur:[3,1,2,7,5],apach:[1,2,5],souhaitez:1,should:[6,2,7,5],theme:7,cliquabl:8,"destin\u00e9":8,"particuli\u00e8r":[1,8],folder:6,local:[6,1,2,7,5],move:[2,5],hit:6,contribut:[1,2,5],get:[3,1,2,5,6],familiar:7,your_local_nam:2,stop:2,regularli:6,solut:[1,5],"param\u00e8tr":1,cannot:6,meter:2,wheezi:[1,2,5],a2ensit:[1,5],report:2,"d\u00e9velopp\u00e9":8,geo:[1,5],lisibl:1,requir:[6,2,7],layout:[0,3],enabl:[6,2,4],chimere_localnam:[2,7],reload:[1,7,5],qui:[1,8],leur:[1,8],common:[6,1,2,5],rechargez:1,contain:[4,5],toujour:1,where:[6,7],valid:[6,8,4],view:7,bleu:8,set:[1,2,4,5,6,7],project_nam:[1,5],fair:[1,8],"chim\u00e8r":[0,1,2,3,4,5,6,7,8],principal:8,knowledg:2,kombu:2,"m\u00e9dia":1,displai:[7,4],touch:[1,2,5],see:[6,7,4],mandatori:[6,7,4],"recommand\u00e9":1,sou:[1,8],violet:8,ordr:8,obtenir:1,concern:[6,8],jqueri:[1,2,5],statu:[8,7,4],still:5,"d\u00e9sactiv":8,correctli:4,"cach\u00e9":8,vari:6,someth:5,vont:8,below:5,label:[7,4],pouvez:8,state:[6,7,4],won:[6,2],chemin:[1,8],between:[6,2],lui:8,jquery_url:2,experi:[6,2],"list\u00e9":8,email:5,signatur:1,accord:5,appreci:5,kei:[0,7,5,6],effet:8,javascript:[1,2,5],dossier:1,auteur:[1,8],french:5,"export\u00e9":8,purpl:[8,4],addit:5,cyclemap:[0,7],both:4,adaptez:1,shapefil:6,"r\u00e9f\u00e9renc":8,admin:[8,1,2,4,5],gpsbabel_opt:2,etc:[1,7,5],"d\u00e9sactiv\u00e9":8,instanc:[0,1,2,4,5,6],tout:8,logic:0,comm:1,login:4,com:7,"adapt\u00e9":1,english:4,"c\u00f4t\u00e9":8,technic:7,point:[2,8,7],color:[7,4],devrait:8,"s\u00fbr":1,arriv:7,chmod:[1,5],"r\u00e8gle":1,colon:0,littl:7,"d\u00e9finir":8,linux:[1,2,5],mapquest:[0,7,6],colonn:8,seulement:1,lorsqu:8,duplic:6,"d\u00e9pos\u00e9":8,quit:4,arg:6,copiez:1,coupl:6,folow:2,come:4,due:7,empti:6,example_project:[0,1,2,5],depui:[1,8],json:[1,5],treat:[6,4],interest:[7,4],basic:[2,4,7],popul:5,"propri\u00e9t\u00e9":8,filtr:8,"associ\u00e9":8,createlang:[1,5],remplacera:8,regroup:5,pri:8,imag:[1,5],convert:6,understand:4,last:[1,5],present:[0,2,3,4,5,6,7],"case":[6,7,8],multi:8,save:4,chimere_path:[2,7],look:[7,4],amend:[3,8,4],"entr\u00e9":8,secret_kei:[1,5],properti:[3,2,4,7,6],chimere_tag:2,easier:7,trick:2,defin:[0,7,6],facil:8,abov:6,error:[6,2],indiqu:8,value_of_your_localnam:2,envvar:[1,5],tant:[1,8],fixtur:[1,5],codag:1,compilemessag:[1,2,5],openstreetmap:6,bin:[1,2,5],layer:[0,7,3],would:[2,5],customiz:7,"supprim\u00e9":8,kmlz:6,conten:[1,8],biai:1,"\u00e9tienn":[0,1,2,4,5,6,7,8],prenez:1,comport:1,activ:[1,2,7,5],soit:8,archiv:[1,5],uncom:5,conf:[1,5],"compl\u00e9ter":1,mod:[1,5],sever:2,par:[1,8],"null":6,develop:4,welcom:[3,7],open:7,author:[0,2,4,5,6,7],parti:1,make:[6,2,4,7],header:4,root_urlconf:[1,2,5],same:[6,7,4,5],affich:8,balis:8,pass:8,html:[0,8,4],changepassword:7,explanatori:4,easi:2,web:[0,1,2,3,6,7],eventu:6,choisissez:1,mod_wsgi:[1,5],pan:7,complet:[7,5],wgs84:6,webserv:[3,2,5],cryptographiqu:1,forgotten:[7,4],effect:4,cliquant:8,libj:[1,2,5],auth:7,jquery_css_url:[1,5],mani:[2,4,7],extern:[8,7,4],jour:[1,8],"coch\u00e9":8,posgi:1,recent:4,"modifi\u00e9":8,pwprompt:[1,5],appropri:[0,7,5,6],moder:[3,7,4],paquet:1,chimere_app_path:[2,7],entri:4,"affich\u00e9":8,well:[0,5],non:[6,1,8],exampl:[1,7,4,5],command:[1,5],thi:[0,2,4,5,6,7],choos:[6,5],soient:8,model:[3,2,7],voulez:[1,8],propos:[8,1,7,4],nommag:1,seul:[1,8],identifi:[8,6,7,4],just:[1,2,8,5],chimere_hide_propertymodel:7,couleur:8,"trait\u00e9":8,obtain:5,"s\u00e9lectionn\u00e9":8,sampl:[1,2,5],comprendr:8,distant:6,human:7,createsuperus:7,simpli:7,flavor:7,yet:[6,2],languag:[0,5,3],traitement:8,task:7,expos:4,fait:[1,8],autant:1,"53k":[1,5],shortcut:4,apache2:[1,5],identif:[8,4],add:[0,2,4,7,6],chaqu:8,simplejson:[1,2,5],xvjf:[1,5],descendant:8,adress:[1,8],survolez:1,anglai:8,applic:[8,1,7,4,5],formulair:8,deux:8,format:[6,8,4],preserv:6,regard:6,librement:8,piec:7,mot:8,relativ:8,bouton:8,password:[6,7,4],prise:8,name:[0,2,4,5,6,7],aurez:1,like:[2,4,7,5],semi:0,"d\u00e9fini":8,fournir:8,mychimere_project:[1,5],activez:1,manual:7,zoom:7,staticfil:2,server:[6,2,7,5],gpsbabel:[1,2,5],princip:8,authentifi:4,necessari:[2,7,5],"accept\u00e9":1,customis:[0,2,3],resiz:4,pratiqu:8,"d\u00e9tail":8,"d\u00e9p\u00f4t":1,encount:5,www:[1,2,5],right:[7,4],old:2,besoin:1,simplifi:2,staff:7,poi:4,paragraph:[2,7],back:4,self:4,"export":[3,8,4,6],language_cod:[1,5],syncdb:[1,2,5],guess:6,transport:[0,7],ici:1,est:[1,8],langag:1,lead:4,confirm:[8,4],kml:6,"install\u00e9":1,per:7,libapache2:[1,5],jquery_js_url:[1,5],larg:5,proj:[6,1,5],slash:4,prequi:1,"mod\u00e9rat":8,three:4,avoir:1,foi:8,refer:[0,4,5],"premi\u00e8r":8,plu:[8,1,4],previou:2,run:2,bold:4,cliquer:8,devin:1,enregistr:8,usag:7,cliquez:8,uncommit:2,step:[2,4,7],squeez:[1,2,5],prerequisit:[3,5],srid:6,wget:[1,5],unicod:[1,5],"disponibilit\u00e9":8,trustworthi:7,postgresql:[1,5],"\u00eatre":[1,8],column:[6,4],http:[8,1,2,4,5],page:[0,1,3,4,6,7,8],srv:[2,7],"f\u00e9licit":1,pertin:[1,8],discard:4,"cat\u00e9gori":8,"donn\u00e9":[1,8],"libell\u00e9":8,cett:[1,8],feed:[1,7,5],"d\u00e9commentez":1,effici:4,letter:[2,5],remplir:1,gard:1,submitt:4,lien:8,bound:[6,7],automat:[6,7],two:[6,7],champ:8,been:[0,2,4,5,6,7],contrib:[1,2,5],"import":[3,1,2,4,5,6,7,8],mark:6,your:[0,2,4,5,6,7],libgeo:[1,5],manag:[0,1,2,3,4,5,6,7,8],accordingli:5,git:[1,2,5],fill:6,log:[1,2,4,7,5],real:4,pictur:7,lok:[0,1,2,4,5,6,7,8],celui:1,secret:5,"long":7,custom:[0,7,5,3],avail:[0,1,2,4,5,6,7],lost:2,interfac:7,gra:8,"var":[1,2,5],icon:[2,4,7],"\u00e9dition":8,"intitul\u00e9":8,"function":7,auriez:1,properli:7,rejet:8,form:[6,7,4],forc:[3,2],ascend:4,recommend:6,horair:1,facilit:[6,8,4],readabl:[7,5],your_chimere_path:2,collectstat:[1,2,5],link:[0,4,6],translat:[3,2,5],pyexiv2:[1,2,5],cryptograph:5,stand:5,"true":7,meilleur:1,congratul:5,pull:2,robust:6,made:[0,2,4],utf:[1,5],possibl:[8,6,7,4],"default":[0,1,2,5,6,7],"d\u00e9placez":1,fake:2,access:[8,7,4],"th\u00e8me":8,rc3:2,makemessag:[1,5],limit:7,notam:8,otherwis:[7,4],problem:[6,2,5],urn:7,crosstrack:2,"accentu\u00e9":1,rvb:[8,4],featur:6,aerial:0,creat:[3,1,2,4,5,6,7],classic:[6,4],disabl:[6,7,4],certain:8,"pr\u00e9sent":[1,8],parser:[1,5],accentu:5,nouvel:[1,8],lectur:8,"char":5,html2text:[1,5],exist:[6,5],"d\u00e9pendanc":1,file:[0,2,4,5,6,7],some:[0,2,4,5,6],cocher:8,path:[7,4,5],check:[6,7,4,5],appliqu:8,probabl:[2,7],echo:[1,5],freeli:4,"appara\u00eetr":8,perhap:2,encrypt:[1,5],courant:8,relatif:1,titl:4,user:[3,1,2,4,5,7,8],"d\u00e9faut":1,when:[6,7,4],detail:[0,7,4,6],gettext:[1,5],vou:[1,8],field:[1,2,4,5,6,7],other:[6,7],oubliez:8,branch:[1,2,5],titr:8,test:[6,2],you:[0,2,4,5,6,7],"int\u00e9ress":8,validez:8,oublier:8,servernam:5,particular:5,node:6,draw:[6,7,4],repeat:2,chacun:8,peacefrog:[1,2,5],"souhait\u00e9":1,choisir:1,drag:[7,4],consid:2,sql:[1,5],debian:[1,2,5],longitud:6,phone:7,directori:[0,2,5],affichag:8,bottom:4,descript:[1,2,7,5],rule:[2,5],actuel:8,utilisez:1,chown:[1,2,5],fact:[6,4],time:[7,5],exempl:[1,8],w3c:6,"t\u00e9l\u00e9chargez":1,"secr\u00e8t":1},objtypes:{},titles:["Customisation","Installation","Upgrade","Welcome to Chim\u00e8re&#8217;s documentation!","Administration","Installation","Import/export","Configuration","Administration"],objnames:{},filenames:["customisation","fr/install","upgrade","index","administration","install","import_export","configuration","fr/administration"]}) \ No newline at end of file
+Search.setIndex({objects:{},terms:{all:[6,2,4,8],code:[0,1,2,4,5,7,9],forget:[2,4],rentrer:1,"d\u00e9j\u00e0":1,"n\u00e9cessair":[7,1,9],yellow:4,signific:[2,5],osm:[0,4,7,6,8,9],per:8,abil:6,follow:[2,8,5],"\u00e9tape":9,redimensionn:9,row:4,content:[6,8,4],utilisateur:[1,9],recommand:5,depend:[3,2,5,6],system:4,zone:[7,5],donner:9,"mani\u00e8r":[1,9],"d\u00e9fini":[7,9],xapi:6,send:5,cach:[3,2,8],realli:6,init:[1,5],revenir:9,text:8,sens:4,"r\u00e9f\u00e9rez":[7,1],ajout:[7,9],adapt:[2,5],"apr\u00e8":9,"am\u00e9lior":7,sourc:[3,1,2,4,5,6,9],string:[2,5],prendr:1,than:6,"valid\u00e9":9,semi:0,parfoi:9,util:9,mechan:6,veri:6,garder:9,voir:9,relev:[6,4,5],tri:9,"\u00e9cart\u00e9":9,"r\u00e9agenc\u00e9":9,cryptograph:5,button:[6,8,4],list:[6,1,9,4,5],geograph:[6,8,4,5],"pr\u00e9sentat":[7,9],"try":6,item:[3,8,4,6],form:[6,8,4],courriel:1,signif:1,particularli:6,"proc\u00e9dur":1,refer:[0,4,5],initialis:[3,1,2,8,5],dir:[1,5],teh:[],"sp\u00e9cifiqu":9,"derni\u00e8r":1,sync:6,sign:5,second:[9,4],droit:9,design:[0,7,6,3],fourni:[1,9],download:[1,5],further:2,myusernam:[1,5],click:[8,4],append:6,"propos\u00e9":9,blue:[9,4],what:6,lettr:1,appear:4,preserv:6,feedpars:[1,2,5],section:[9,8,4],multimedia:[8,4],abl:8,quelqu:[1,9],overload:6,"\u00e9l\u00e9ment":[7,9],current:[2,4,8],delet:[6,8,4],simpliest:5,sur:[1,9],effectif:9,calqu:7,peuvent:9,"new":[0,2,3,4,5,6,7,8],net:[1,2,5],fuseau:1,cela:[1,9],chimer:[0,1,2,4,5,6,7,8,9],administrateur:[1,9],chose:1,longitud:6,usag:8,createdb:[1,5],supprim:9,here:[6,5],georss:6,"005k":2,modif:[9,8,4],cart:9,"\u00e9tait":1,address:6,ver:[7,1,9],modifi:[0,4,5,7,6,8,9],sinc:5,valu:[6,2,4,5],"m\u00eame":[1,9],box:[6,8,4],search:4,larger:0,envoy:1,proj:[6,1,5],permit:[8,4],action:[6,9,4],chang:[0,2,4,5,6,8],changer:9,chanc:8,environn:2,"mod\u00e9rateur":9,"d\u00e9sir\u00e9":1,prerequisit:[3,5],extra:[0,4],appli:[2,4,8],modul:[1,5],apt:[1,2,5],vim:[1,2,5],filenam:6,api:[0,6,7],subcategori:[3,8,4,6],visibl:[6,9,4],marker:[6,2],instal:[3,1,2,5,7,8,9],should:[6,2,8,5],"ad\u00e9quat":7,yourself:4,from:[6,2,4,5],patron:[7,1],zip:6,choos:[6,5],univers:[1,5],upgrad:[3,2],next:2,websit:[8,5],few:[8,4],usr:[1,2,5],criteria:4,"\u00eate":9,"r\u00e9ell":9,assez:9,type:[0,1,4,5,7,6,8,9],more:[0,8,4,5,6],sort:[8,4],contient:9,where_is_your_chimer:[9,4],desir:[6,5],filtrer:9,"utilis\u00e9":[1,9],relat:5,commencez:1,server_url:2,fonction:1,comport:1,warn:[6,2,9],parlent:9,templat:[7,0,2,5,3],aux:[1,9],moin:1,hold:8,unpack:5,easiest:0,"rattach\u00e9":9,must:[0,2,8,5],psql:[1,5],account:[6,8,4,5],word:4,hour:8,trouvent:1,car:1,prepar:2,work:[2,4,8],uniqu:[6,1,8,5],pour:[7,1,9],soup:[1,5],"g\u00e9rer":9,modifiez:1,can:[0,2,4,5,6,8],lc_messag:[1,5],meet:6,"g\u00e9rez":1,root:[1,5],obliqu:9,appropri:[0,8,5,6],control:8,abord:[1,9],prompt:[6,5],tar:[1,5],give:8,process:[6,2,4],requi:1,share:[1,5],accept:6,listent:9,bienvenu:1,tag:[6,1,4,5],want:[0,8,4,5,6],tarbal:2,agenc:7,suivant:1,"ent\u00eat":9,clair:9,alwai:6,chimere_export:6,lxml:[1,2,5],end:[9,0,8,4,3],freshli:4,anoth:[4,5],tableau:9,rapport:1,mapnik:[0,8,7],pure:0,reject:4,verifi:2,csv:6,simpl:[1,4,6,7,8,9],css:[0,1,8,5,7],email_host:[1,5],map:[0,8,4,6,7],product:2,rebas:2,mess:6,clone:[1,2,5],after:[6,2,4],minimum:1,"long":8,superus:8,witch:8,befor:[6,2,4],cours:5,sinon:9,attent:9,discard:4,date:[0,1,2,4,5,6,7,8,9],multipl:4,underscor:[2,5],associ:[6,8,4],"ic\u00f4n":9,welcom:[3,8],projet:1,permet:9,practic:8,third:4,bind:2,bing:[0,7],explicit:6,avant:9,"acc\u00e9der":9,django:[0,1,2,5,7,8],issu:6,inform:[9,6,1,8,4],cannot:6,environ:[2,8],allow:8,parti:1,sont:[7,1,9],"biblioth\u00e8qu":[7,1],order:[6,8,4],oper:4,checkbox:[6,4],help:6,apparaiss:9,"gliss\u00e9":9,becaus:[6,2,5],peut:[7,1,9],"int\u00e9r\u00eat":9,installez:1,effici:4,tinymce_url:[1,5],nombr:[1,9],mainli:[0,4],"\u00e9dition":9,dynam:8,paramet:5,balis:9,style:[0,7],group:8,directli:[6,8,4],fit:[0,5],chosen:6,psycopg2:[1,5],changement:[7,9],clickabl:4,better:[1,5],platform:6,pend:6,eux:9,where_is_chimer:[1,5],onc:[6,8,4],"op\u00e9rat":9,hidden:[8,4],main:[6,4],fin:9,"g\u00e9n\u00e9ralement":9,changepassword:8,nom:[1,9],them:[6,2,4,5],thei:[8,4],python:[1,2,5],lien:[7,9],dan:[7,1,9],taill:9,handi:6,"suppl\u00e9mentair":[7,1,9],number:[6,2,4,8,5],framework:[3,8],cet:9,autr:[7,1,9],optionnel:1,instead:6,nov:[1,5],echo:[1,5],regroupez:1,trajet:9,"bas\u00e9":1,choic:6,eventu:6,administr:[0,1,3,4,5,6,7,8,9],trac:1,unidecod:[1,5],edit:[3,2,4,5],aucun:9,drop:4,refresh:[3,2,6],easili:[6,4],localis:6,alreadi:5,each:[0,8,4,6],"\u00eatre":[7,1,9],found:5,smtp:[1,5],updat:[0,2,3,4,5,6,8],mean:[6,8,4],compil:[3,1,5],dispon:[7,1,9],domain:8,"int\u00e9rieur":9,kml:6,chimere_app_path:[2,8],subcategory_id:6,replac:[4,5],lign:[1,9],blank:4,crontab:6,upload:[2,5],"cr\u00e9er":[1,9],"static":[1,2,5],forgot:8,"cr\u00e9ez":1,wgs84:6,dispos:9,"probl\u00e8m":1,special:[2,4,5],out:4,variabl:[1,2,8,5],"cl\u00e9":1,tinymc:[1,5],newli:[6,4],"nomm\u00e9":7,publish:2,categori:[3,8,4,6],contenu:9,valeur:[1,9],translat:[3,2,5],print:6,got:6,correct:[6,1,2,5],red:[9,4],serveur:1,postgr:[1,5],ascendant:9,pui:7,insid:[8,4],state:[6,8,4],migrat:[3,1,2,5],precaut:2,differ:[0,8],free:5,standard:6,reason:8,base:[6,1,8,9,5],que:[7,1,9],postgi:[1,5],org:[1,2],"9227c9":[9,4],cliquant:9,mychimer:[2,8],unpredict:5,gdal:[1,2,5],care:[6,4,5],ensuit:[1,9],spatial_ref_si:[1,5],wai:[0,5,6],launch:6,where:[6,8],could:[6,2],pictur:8,put:[6,4],static_url:2,keep:[6,4],filter:[6,4],length:[2,5],trier:9,place:1,isn:4,outsid:8,geometri:6,lancer:1,think:6,south:[1,2,5],first:[6,2,4,8,5],origin:6,pleas:5,major:2,celui:1,beauti:[1,5],"pr\u00e9sent\u00e9":9,"troisi\u00e8m":9,feel:5,suffit:1,"pr\u00e9":1,"pr\u00e8":9,oubliez:9,votr:[7,1],restrict:8,mai:[1,8,9],instruct:2,"import\u00e9":9,done:[0,2,8,5,6],messag:[6,8],mydjango:[1,5],owner:[1,5],stabl:[1,2,5],createsuperus:8,installed_app:2,optionali:5,ont:[1,9],size:4,given:[6,2,5],lister:1,fonctionn:9,boit:9,script:2,avec:[7,1,9],licens:6,mkdir:[1,2,5],sometim:6,least:[2,8,5],tou:9,avez:[1,9],attach:4,master:[2,5],cliquabl:9,interfac:8,proposit:9,conveni:[6,4],"final":[7,6],store:6,conduit:9,pare:9,ainsi:9,"trac\u00e9":9,copi:[0,2,5],install_path:[1,5],plane:[],direct:[2,9],recherch:9,"short":5,consult:[9,4],haven:2,vari:6,rss:8,serv:[2,8],kind:0,"compl\u00e9t\u00e9":1,provid:[6,4,5],remov:[2,4],satisfair:1,requir:[6,2,8],plupart:[1,9],project:[3,2,8,5,6],ressourc:8,gestion:[7,1,9],other:[6,8],initi:[2,8,5],transport:[0,8,7],browser:[3,2],latitud:6,"affich\u00e9":9,"param\u00e9trag":1,"acc\u00e8":9,"copi\u00e9":7,favorit:5,tiret:1,beforehand:6,ani:[6,2,5],correspond:1,myproject:0,packag:[2,5],"g\u00e9ographiqu":[1,9],faut:1,stash:2,have:[6,2,4,8,5],tabl:[9,1,4,5],need:[0,8,4,5,6],seem:6,element:4,pg_version:[1,5],plpgsql:[1,5],option:2,raccourci:9,suivr:1,bz2:[1,5],"\u00e9ventuel":9,min:2,rout:[6,8,4],expos:4,courant:9,"d\u00e9connexion":9,note:[9,6,2,4,5],also:[6,2,4],ideal:6,exampl:[1,8,4,5],"d\u00e9commentez":1,take:5,obligatoir:9,properli:8,roug:9,default_data:[1,5],"r\u00e9pertoir":1,compat:0,begin:[2,5],sure:6,distribut:[1,5],trace:6,normal:6,usernam:[6,8],object:6,statu:[9,8,4],doit:[1,9],most:[8,4,5],render:8,"\u00e9tat":9,plan:2,compt:[1,9],remplacez:1,geodjango:[1,5],why:6,sub:4,doivent:9,time_zon:[1,5],don:[6,2,4,8,5],refract:1,url:[1,2,4,5,6,8],clear:4,"\u00e9ditez":1,openlay:[0,7],your_chimere_path:2,inde:4,"g\u00e9r\u00e9e":9,part:5,determin:6,efficac:9,"r\u00e9cemment":9,came:6,personnalis:7,wsgi:[1,2,5],set:[1,2,4,5,6,8],show:8,visitor:[3,2],"\u00e9quival":1,conserv:9,beautifulsoup:[1,5],area:[0,7,6,8,3],session:8,loaddata:[1,5],permiss:[1,8,5],identifi:[9,6,8,4],descendant:9,"compos\u00e9":[7,9],data:[6,1,2,4,5],find:6,addit:5,"multim\u00e9dia":9,celeri:[1,2,5],fichier:[7,1,9],onli:[0,2,4,5,6,8],locat:2,just:[7,1,2,9,5],copyright:[0,1,2,4,5,6,7,8,9],"pr\u00e9f\u00e9r\u00e9e":1,explain:4,configur:[3,1,2,8,5],apach:[1,2,5],souhaitez:[7,1],"cr\u00e9ation":1,like:[2,4,8,5],theme:8,version:[0,1,2,3,4,5,6,7,8,9],"destin\u00e9":9,"diff\u00e9rent":7,chemin:[1,9],folder:6,local:[6,1,2,8,5],move:[2,5],hit:6,contribut:[1,2,5],get:[3,1,2,5,6],familiar:8,your_local_nam:2,stop:2,linux:[1,2,5],regularli:6,solut:[1,5],mainten:[1,9],meter:2,wheezi:[1,2,5],a2ensit:[1,5],report:2,"d\u00e9velopp\u00e9":9,geo:[1,5],lisibl:1,restart:2,layout:[0,3],shp:6,enabl:[6,2,4],probabl:[2,8],chimere_localnam:[2,8],reload:[1,8,5],qui:[1,9],leur:[1,9],common:[6,1,2,5],rechargez:1,contain:[4,5],toujour:1,"caract\u00e8r":1,view:8,bleu:9,nouveau:7,barr:9,project_nam:[1,5],fair:[7,1,9],"chim\u00e8r":[0,1,2,3,4,5,6,7,8,9],principal:[7,9],knowledg:2,kombu:2,"m\u00e9dia":1,see:[6,8,4],mandatori:[6,8,4],"recommand\u00e9":1,rejet:9,violet:9,ordr:9,flavor:8,"d\u00e9placez":1,concern:[6,9],jqueri:[1,2,5],"acc\u00e8d":9,still:5,"d\u00e9sactiv":9,correctli:4,"cach\u00e9":9,databas:[3,1,2,5,6,8],someth:5,vont:9,label:[8,4],pouvez:[7,9],bien:[7,1,9],won:[6,2],"particuli\u00e8r":[1,9],between:[6,2],lui:9,experi:[6,2],email:5,signatur:1,accord:5,javascript:[7,1,2,5],appreci:5,kei:[0,8,6,5,7],effet:9,ask:[6,8],court:1,dossier:[7,1],job:6,comm:1,french:5,otherwis:[8,4],"export\u00e9":9,purpl:[9,4],cli:[6,2,8],cyclemap:[0,8,7],both:4,adaptez:1,shapefil:6,"r\u00e9f\u00e9renc":9,admin:[9,1,2,4,5],gpsbabel_opt:2,champ:9,etc:[1,8,5],instanc:[0,1,2,4,5,6,7],tout:9,logic:0,auteur:[7,1,9],login:4,com:8,"adapt\u00e9":1,"c\u00f4t\u00e9":9,technic:8,point:[7,2,9,8],color:[8,4],devrait:9,"s\u00fbr":1,correspondr:7,arriv:8,chmod:[1,5],"r\u00e8gle":1,featur:6,colon:0,littl:8,"d\u00e9finir":[7,9],poi:4,mapquest:[0,8,6,7],monprojet:7,colonn:9,pyexiv2:[1,2,5],seulement:1,lorsqu:9,duplic:6,"d\u00e9pos\u00e9":9,quit:4,copiez:1,coupl:6,folow:[],come:4,shortcut:4,classic:[6,4],copier:7,due:8,empti:6,example_project:[0,1,2,5,7],depui:[1,9],json:[1,5],treat:[6,4],interest:[8,4],basic:[2,4,8],popul:5,"propri\u00e9t\u00e9":9,filtr:9,adress:[1,9],"associ\u00e9":9,createlang:[1,5],parser:[1,5],remplacera:9,regroup:5,pri:9,imag:[1,5],convert:6,argument:6,understand:4,last:[1,5],collectstat:[1,2,5],present:[0,2,3,4,5,6,8],"case":[6,8,9],multi:9,save:4,look:[8,4],amend:[3,9,4],"entr\u00e9":9,secret_kei:[1,5],properti:[3,2,4,8,6],easier:8,trick:2,defin:[0,8,6],facil:9,abov:6,error:[6,2],indiqu:9,value_of_your_localnam:2,envvar:[1,5],tant:[1,9],fixtur:[1,5],compilemessag:[1,2,5],openstreetmap:6,anglai:9,layer:[0,7,8,3],customiz:8,"supprim\u00e9":9,kmlz:6,conten:[1,9],chimere_hide_propertymodel:8,biai:1,"\u00e9tienn":[0,1,2,4,5,6,7,8,9],prenez:1,site:[3,1,4,5,8,9],activ:[1,2,8,5],soit:9,archiv:[1,5],uncom:5,conf:[1,5],"compl\u00e9ter":1,sever:2,par:[7,1,9],"null":6,develop:4,"syst\u00e8m":9,open:8,author:[0,2,4,5,6,8],media:[1,2,5],make:[6,2,4,8],format:[6,9,4],root_urlconf:[1,2,5],same:[6,8,4,5],affich:9,member:8,pass:9,"th\u00e8me":9,descend:4,document:[0,1,2,3,4,5,6,7,8,9],choisissez:1,mod_wsgi:[1,5],pan:8,complet:[8,5],"identifi\u00e9":9,webserv:[3,2,5],cryptographiqu:1,forgotten:[8,4],effect:4,dai:8,auth:8,applic:[9,1,8,4,5],mani:[2,4,8],extern:[9,8,4],jour:[7,1,9],"coch\u00e9":9,posgi:1,recent:4,"modifi\u00e9":[7,9],pwprompt:[1,5],task:8,moder:[3,8,4],paquet:1,"\u00e9galement":9,entri:4,"d\u00e9sactiv\u00e9":9,well:[0,5],non:[6,1,9],without:6,command:[6,1,5],thi:[0,2,4,5,6,8],english:4,san:7,soient:9,model:[3,2,8],feuill:7,voulez:[1,9],piec:8,propos:[9,1,8,4],nommag:1,contenir:9,execut:2,chimere_tag:2,couleur:9,"trait\u00e9":9,obtain:5,"s\u00e9lectionn\u00e9":9,chimere_import:6,select:[6,8,4],distant:6,human:8,touch:[1,2,5],simpli:8,obtenir:1,yet:[6,2],languag:[0,5,3],traitement:9,web:[0,1,2,3,6,8],now:[2,4,5],easi:2,virgul:7,"personnalis\u00e9":7,fait:[7,1,9],"\u00e9t\u00e9":[7,1,9],"53k":[1,5],vide:9,apache2:[1,5],identif:[9,4],add:[0,2,4,8,6],chaqu:[7,9],recommend:6,mod:[1,5],osgeo:1,survolez:1,bin:[1,2,5],libj:[1,2,5],formulair:9,deux:9,"appropri\u00e9":1,read:4,regard:6,librement:9,"fran\u00e7ai":1,mot:9,test:[6,2],bouton:9,password:[6,8,4],you:[0,2,4,5,6,8],name:[0,2,4,5,7,6,8],aurez:1,"d\u00e9faut":[7,1],jquery_css_url:[1,5],specif:[6,5],header:4,fournir:9,mychimere_project:[1,5],activez:1,manual:8,html:[0,9,4,7],staticfil:2,server:[6,2,8,5],gpsbabel:[1,2,5],princip:9,authentifi:4,necessari:[2,8,5],"install\u00e9":1,"accept\u00e9":1,customis:[7,0,2,3],output:6,resiz:4,pratiqu:9,"d\u00e9tail":[7,9],"d\u00e9p\u00f4t":1,two:[6,8],import_id:6,encount:5,www:[1,2,5],right:[8,4],old:2,besoin:[7,1],simplifi:2,staff:8,creation:[9,5],paragraph:[2,8],back:4,phone:8,self:4,certain:9,feed:[1,8,5],"export":[3,9,4,6],language_cod:[1,5],syncdb:[1,2,5],"cat\u00e9gori":9,guess:6,"n\u00e9cessit":[1,9],ici:1,est:[7,1,9],chacun:9,lead:4,confirm:[9,4],makemessag:[1,5],codag:1,xvjf:[1,5],conteneur:9,libapache2:[1,5],jquery_js_url:[1,5],larg:5,explanatori:4,slash:4,titr:9,prequi:1,"mod\u00e9rat":9,three:4,avoir:1,foi:9,"initialis\u00e9":1,"premi\u00e8r":9,plu:[7,1,9,4],previou:2,run:2,bold:4,cliquer:9,devin:1,"d\u00e9compressez":1,cliquez:9,uncommit:2,step:[2,4,8],logiqu:7,squeez:[1,2,5],repositori:[2,5],srid:6,wget:[1,5],unicod:[1,5],"disponibilit\u00e9":9,trustworthi:8,postgresql:[1,5],would:[2,5],column:[6,4],http:[9,1,2,4,5],page:[0,1,3,4,6,7,8,9],integr:2,srv:[2,8],"f\u00e9licit":1,pertin:[1,9],"list\u00e9":9,backup:2,"donn\u00e9":[1,9],"libell\u00e9":9,cett:[1,9],arg:6,own:8,addus:[1,5],letter:[2,5],remplir:1,sql:[1,5],gard:1,submitt:4,encod:[1,5],bound:[6,8],automat:[6,8],son:9,sou:[1,9],been:[0,2,4,5,6,8],contrib:[1,2,5],"import":[3,1,2,4,5,6,7,8,9],mark:6,your:[0,2,4,5,6,8],libgeo:[1,5],manag:[0,1,2,3,4,5,6,7,8,9],accordingli:5,git:[1,2,5],fill:6,log:[1,2,4,8,5],real:4,plusieur:9,lok:[0,1,2,4,5,6,7,8,9],initial:1,secret:5,submit:[4,5],custom:[0,8,5,3],avail:[0,1,2,4,5,6,8],lost:2,traduct:1,gra:9,"var":[1,2,5],icon:[2,4,8],jquery_url:2,"intitul\u00e9":9,"function":8,auriez:1,chimere_path:[2,8],simplement:7,local_set:[1,2,8,5],simplejson:[1,2,5],forc:[3,2],ascend:4,classiqu:9,horair:1,facilit:[6,9,4],readabl:[8,5],pwd:2,doi:7,link:[0,4,6],procedur:5,zoom:8,"\u00e9crit":7,line:[2,5],stand:5,"true":8,meilleur:1,congratul:5,pull:2,robust:6,made:[0,2,4],utf:[1,5],possibl:[9,6,8,4],"default":[0,1,2,5,6,8],checkout:[1,2,5],fake:2,access:[9,8,4],displai:[8,4],rc3:2,below:5,"cha\u00een":7,limit:8,notam:9,backport:[1,2,5],problem:[6,2,5],urn:8,crosstrack:2,"accentu\u00e9":1,rvb:[9,4],later:[2,8],aerial:[0,7],creat:[3,1,2,4,5,6,8],createus:[1,5],disabl:[6,8,4],"h\u00e9sitez":1,utilis:7,sampl:[1,2,5],accentu:5,nouvel:[1,9],lectur:9,"char":5,html2text:[1,5],exist:[6,5],"d\u00e9pendanc":1,file:[0,2,4,5,6,8],some:[0,2,4,5,6],cocher:9,path:[8,4,5],check:[6,8,4,5],appliqu:9,"g\u00e9r\u00e9":1,autant:1,freeli:4,"appara\u00eetr":9,encrypt:[1,5],exempl:[7,1,9],relatif:1,titl:4,user:[3,1,2,4,5,8,9],seul:[1,9],when:[6,8,4],detail:[0,8,4,6],gettext:[1,5],vou:[7,1,9],field:[1,2,4,5,6,8],valid:[6,9,4],librari:[1,5],branch:[1,2,5],comprendr:9,relativ:9,prise:9,"int\u00e9ress":9,validez:9,oublier:9,servernam:5,particular:5,node:6,draw:[6,8,4],repeat:2,langag:[7,1],peacefrog:[1,2,5],"souhait\u00e9":1,choisir:1,drag:[8,4],consid:[2,5],"param\u00e8tr":1,debian:[1,2,5],enregistr:9,migrate_properti:2,directori:[0,2,5,6],affichag:9,bottom:4,descript:[1,2,8,5],"pr\u00e9sent":[7,1,9],actuel:9,utilisez:1,chown:[1,2,5],rule:[2,5],fact:[6,4],time:[8,5],perhap:2,w3c:6,"t\u00e9l\u00e9chargez":1,"secr\u00e8t":1},objtypes:{},titles:["Customisation","Installation","Upgrade","Welcome to Chim\u00e8re&#8217;s documentation!","Administration","Installation","Import/export","Customisation","Configuration","Administration"],objnames:{},filenames:["customisation","fr/install","upgrade","index","administration","install","import_export","fr/customisation","configuration","fr/administration"]}) \ No newline at end of file
diff --git a/docs/_build/html/upgrade.html b/docs/_build/html/upgrade.html
index c38cc8f..56d800c 100644
--- a/docs/_build/html/upgrade.html
+++ b/docs/_build/html/upgrade.html
@@ -64,17 +64,23 @@
</table>
<p>This document presents the upgrade of Chimère.
It has been updated for version 2.0.0.</p>
-<p>Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
-The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (&gt;2.0)
-of Chimère.</p>
-<p>If several versions has been published, you should repeat any upgrading steps.
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Before any upgrade backup the database and all your installation files
+(specially if you have made changes to them).</p>
+</div>
+<p>The process for migration requires a basic knowledge of Git and Linux CLI. It is
+<em>not</em> an easy process. A work is currently done to easy the upgrade in later
+versions (&gt;2.0) of Chimère.</p>
+<p>If several versions have been published, you should repeat all upgrading steps.
For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
to v2.0. The only optional step is the integration of your customisations.</p>
-<p>The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.</p>
-<p>The instruction are given for Debian Squeeze and Debian Wheezy.</p>
+<p>The current stable version is 2.0.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are considering to contribute on Chimère get the Git master.</p>
+</div>
+<p>The instructions are given for Debian Squeeze and Debian Wheezy.</p>
<div class="section" id="getting-new-versions-of-dependencies">
<h2>Getting new versions of dependencies<a class="headerlink" href="#getting-new-versions-of-dependencies" title="Permalink to this headline">¶</a></h2>
<div class="section" id="version-1-1-1-2">
@@ -100,7 +106,7 @@ Then install the new dependencies:</p>
python-pyexiv2 python-feedparser javascript-common
</pre></div>
</div>
-<p>If you are planing to do major import consider the install of <a class="reference external" href="http://celeryproject.org/">Celery</a>.</p>
+<p>If you are planning to do major import consider the install of <a class="reference external" href="http://celeryproject.org/">Celery</a>.</p>
<div class="highlight-bash"><div class="highlight"><pre>apt-get install python-django-celery python-kombu
</pre></div>
</div>
@@ -109,8 +115,8 @@ Then install the new dependencies:</p>
</div>
<div class="section" id="getting-the-new-sources">
<h2>Getting the new sources<a class="headerlink" href="#getting-the-new-sources" title="Permalink to this headline">¶</a></h2>
-<p>First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
+<p>First of all you have to get the new version of the source code.
+For the upgrade process, the source code has to be from the Git
repository.</p>
<p>To simplify further instructions, some environment variables are
initialized.</p>
@@ -121,15 +127,15 @@ initialized.</p>
<span class="nv">CHIMERE_LOCALNAME</span><span class="o">=</span>mychimere
</pre></div>
</div>
-<p>Your local name is used for the name of your local git branch and the Python
+<p>Your local name is used for the name of your local Git branch and the Python
package. As a Python package it should follow the rule of Python variable name:
it must be at least one letter and can have a string of numbers, letters and
-&#8220;_&#8221; to any length. Don&#8217;t begin the name by &#8220;_&#8221; because it has special
+underscores (&#8220;_&#8221;) to any length. Don&#8217;t begin the name by &#8220;_&#8221; because it has special
significance in Python.</p>
<div class="section" id="from-a-previous-git-installation">
<h3>From a previous Git installation<a class="headerlink" href="#from-a-previous-git-installation" title="Permalink to this headline">¶</a></h3>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
-git checkout -b <span class="nv">$CHIMERE_LOCALNAME</span> <span class="c"># do it only if you haven&#39;t yet create a local branch</span>
+git checkout -b <span class="nv">$CHIMERE_LOCALNAME</span> <span class="c"># only if you haven&#39;t created yet a local branch</span>
git stash <span class="c"># if you have uncommited changes</span>
git checkout master
git pull
@@ -140,7 +146,7 @@ git rebase <span class="nv">$CHIMERE_TAG</span>
</div>
<div class="section" id="from-a-previous-tarball-installation">
<h3>From a previous tarball installation<a class="headerlink" href="#from-a-previous-tarball-installation" title="Permalink to this headline">¶</a></h3>
-<p>First remove your old installation and get the Git version.</p>
+<p>First remove your old installation and get the Git version:</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
<span class="nb">cd</span> ..
rm -rf <span class="nv">$CHIMERE_PATH</span>
@@ -159,7 +165,7 @@ git checkout -b <span class="nv">$CHIMERE_LOCALNAME</span>
vim <span class="nv">$CHIMERE_APP_PATH</span>/settings.py
</pre></div>
</div>
-<p>Add the line (adapted for your jquery and gpsbabel installation).</p>
+<p>Add the line (adapted for your jquery and gpsbabel installation):</p>
<div class="highlight-python"><div class="highlight"><pre><span class="n">JQUERY_URL</span> <span class="o">=</span> <span class="n">SERVER_URL</span> <span class="o">+</span> <span class="s">&#39;jquery/jquery-1.4.4.min.js&#39;</span>
<span class="n">GPSBABEL</span> <span class="o">=</span> <span class="s">&#39;/usr/bin/gpsbabel&#39;</span>
<span class="c"># simplify with an error of 5 meters</span>
@@ -171,7 +177,7 @@ vim <span class="nv">$CHIMERE_APP_PATH</span>/settings.py
<h4>Version 1.2 -&gt; 2.0<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h4>
<div class="section" id="project-template">
<h5>Project template<a class="headerlink" href="#project-template" title="Permalink to this headline">¶</a></h5>
-<p>Create a new project template.</p>
+<p>Create a new project template:</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
cp -ra <span class="nv">$CHIMERE_PATH</span>/example_project <span class="nv">$CHIMERE_LOCALNAME</span>
<span class="nv">CHIMERE_APP_PATH</span><span class="o">=</span><span class="nv">$CHIMERE_PATH</span>/<span class="nv">$CHIMERE_LOCALNAME</span>
@@ -201,12 +207,12 @@ chown www-data -R /var/log/django
</div>
<div class="section" id="static-files">
<h5>Static files<a class="headerlink" href="#static-files" title="Permalink to this headline">¶</a></h5>
-<p>Now static file are managed with <em>django.contrib.staticfiles</em>.</p>
+<p>Now static files are managed with <em>django.contrib.staticfiles</em>.</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
./manage.py collectstatic
</pre></div>
</div>
-<p>Move old static files to the new static directory.</p>
+<p>Move old static files to the new static directory:</p>
<div class="highlight-bash"><div class="highlight"><pre>cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/* <span class="nv">$CHIMERE_APP_PATH</span>/static/
cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/icons/* <span class="nv">$CHIMERE_APP_PATH</span>/media/icons/
cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/upload <span class="nv">$CHIMERE_APP_PATH</span>/media/
@@ -268,7 +274,7 @@ python ./scripts/upgrade.py
values of an old <em>Property model</em> to this new field, a script is available.</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
../chimere/scripts/migrate_properties.py
-<span class="c"># folow the instructions</span>
+<span class="c"># follow the instructions</span>
</pre></div>
</div>
</div>
@@ -298,9 +304,9 @@ django-admin compilemessages
</div>
</div>
</div>
-<div class="section" id="forcing-the-upgrade-of-visitor-s-web-browser-cache">
-<h2>Forcing the upgrade of visitor&#8217;s web browser cache<a class="headerlink" href="#forcing-the-upgrade-of-visitor-s-web-browser-cache" title="Permalink to this headline">¶</a></h2>
-<p>If major changes in the javascript has be done between version, many of your
+<div class="section" id="forcing-the-refresh-of-visitor-s-web-browser-cache">
+<h2>Forcing the refresh of visitor&#8217;s web browser cache<a class="headerlink" href="#forcing-the-refresh-of-visitor-s-web-browser-cache" title="Permalink to this headline">¶</a></h2>
+<p>If major changes in the javascript has been done between versions, many of your
users could experience problems. There are many tricks to force the refresh
of their cache. One of them is to change the location of statics files. To do
that edit your local_settings.py and change:</p>
@@ -311,7 +317,7 @@ that edit your local_settings.py and change:</p>
<div class="highlight-python"><div class="highlight"><pre><span class="n">STATIC_URL</span> <span class="o">=</span> <span class="s">&#39;/static/v2.0.0/&#39;</span>
</pre></div>
</div>
-<p>Then in the static directory.</p>
+<p>Then in the static directory:</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>/static
ln -s <span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</span> v2.0.0
</pre></div>
@@ -367,7 +373,7 @@ ln -s <span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</sp
<li><a class="reference internal" href="#version-1-2-2-0-master">Version 1.2 -&gt; 2.0 -&gt; master</a></li>
</ul>
</li>
-<li><a class="reference internal" href="#forcing-the-upgrade-of-visitor-s-web-browser-cache">Forcing the upgrade of visitor&#8217;s web browser cache</a></li>
+<li><a class="reference internal" href="#forcing-the-refresh-of-visitor-s-web-browser-cache">Forcing the refresh of visitor&#8217;s web browser cache</a></li>
</ul>
</li>
</ul>
diff --git a/docs/administration.rst b/docs/administration.rst
index 92b6442..672caa9 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -197,7 +197,7 @@ 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.
+This form is a table with three columns:
#. The first column displays the information for the reference item,
#. The second column displays the information proposed by the submitter,
@@ -206,4 +206,4 @@ This form is a table with three columns.
reference item.
.. Note::
- To reject all modification validate the form with no checkbox checked.
+ To reject all modifications validate the form with no checkbox checked.
diff --git a/docs/install.rst b/docs/install.rst
index f26da83..3b8fd38 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -95,6 +95,9 @@ the paths accordingly to your needs)::
Installing the sources
**********************
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
+
Choose a path to install your Chimère::
INSTALL_PATH=/var/local/django
@@ -123,10 +126,10 @@ readable directory::
tar xvjf chimere-last.tar.bz2
chown -R myusername:www-data chimere
-From the git repository
+From the Git repository
+++++++++++++++++++++++
-Another solution is to get it from the git repository::
+Another solution is to get it from the Git repository::
cd $INSTALL_PATH
git clone git://www.peacefrogs.net/git/chimere
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 796ed98..377e5e7 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -11,20 +11,24 @@ Upgrade
This document presents the upgrade of Chimère.
It has been updated for version 2.0.0.
-Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
+.. Warning::
+ Before any upgrade backup the database and all your installation files
+ (specially if you have made changes to them).
+
The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (>2.0)
-of Chimère.
+*not* an easy process. A work is currently done to easy the upgrade in later
+versions (>2.0) of Chimère.
-If several versions has been published, you should repeat any upgrading steps.
+If several versions have been published, you should repeat all upgrading steps.
For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
to v2.0. The only optional step is the integration of your customisations.
The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.
-The instruction are given for Debian Squeeze and Debian Wheezy.
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
+
+The instructions are given for Debian Squeeze and Debian Wheezy.
Getting new versions of dependencies
@@ -57,7 +61,7 @@ Debian Wheezy
apt-get install python-django-south python-simplejson libjs-jquery-ui \
python-pyexiv2 python-feedparser javascript-common
-If you are planing to do major import consider the install of `Celery
+If you are planning to do major import consider the install of `Celery
<http://celeryproject.org/>`_.
.. code-block:: bash
@@ -67,8 +71,8 @@ If you are planing to do major import consider the install of `Celery
Getting the new sources
-----------------------
-First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
+First of all you have to get the new version of the source code.
+For the upgrade process, the source code has to be from the Git
repository.
To simplify further instructions, some environment variables are
@@ -82,10 +86,10 @@ initialized.
CHIMERE_TAG=master # version 2.0 -> master
CHIMERE_LOCALNAME=mychimere
-Your local name is used for the name of your local git branch and the Python
+Your local name is used for the name of your local Git branch and the Python
package. As a Python package it should follow the rule of Python variable name:
it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
+underscores ("_") to any length. Don't begin the name by "_" because it has special
significance in Python.
From a previous Git installation
@@ -94,7 +98,7 @@ From a previous Git installation
.. code-block:: bash
cd $CHIMERE_PATH
- git checkout -b $CHIMERE_LOCALNAME # do it only if you haven't yet create a local branch
+ git checkout -b $CHIMERE_LOCALNAME # only if you haven't created yet a local branch
git stash # if you have uncommited changes
git checkout master
git pull
@@ -104,7 +108,7 @@ From a previous Git installation
From a previous tarball installation
************************************
-First remove your old installation and get the Git version.
+First remove your old installation and get the Git version:
.. code-block:: bash
@@ -128,7 +132,7 @@ Version 1.1 -> 1.2
CHIMERE_APP_PATH=$CHIMERE_PATH/chimere
vim $CHIMERE_APP_PATH/settings.py
-Add the line (adapted for your jquery and gpsbabel installation).
+Add the line (adapted for your jquery and gpsbabel installation):
.. code-block:: python
@@ -142,7 +146,7 @@ Version 1.2 -> 2.0
Project template
................
-Create a new project template.
+Create a new project template:
.. code-block:: bash
@@ -177,14 +181,14 @@ Logging is now enabled by default in the file */var/log/django/chimere.log*.
Static files
............
-Now static file are managed with *django.contrib.staticfiles*.
+Now static files are managed with *django.contrib.staticfiles*.
.. code-block:: bash
cd $CHIMERE_APP_PATH
./manage.py collectstatic
-Move old static files to the new static directory.
+Move old static files to the new static directory:
.. code-block:: bash
@@ -260,7 +264,7 @@ values of an old *Property model* to this new field, a script is available.
cd $CHIMERE_APP_PATH
../chimere/scripts/migrate_properties.py
- # folow the instructions
+ # follow the instructions
From 2.0 to master
******************
@@ -290,10 +294,10 @@ Version 1.2 -> 2.0 -> master
cd $CHIMERE_PATH/chimere
django-admin compilemessages
-Forcing the upgrade of visitor's web browser cache
+Forcing the refresh of visitor's web browser cache
--------------------------------------------------
-If major changes in the javascript has be done between version, many of your
+If major changes in the javascript has been done between versions, many of your
users could experience problems. There are many tricks to force the refresh
of their cache. One of them is to change the location of statics files. To do
that edit your local_settings.py and change::
@@ -304,7 +308,7 @@ to::
STATIC_URL = '/static/v2.0.0/'
-Then in the static directory.
+Then in the static directory:
.. code-block:: bash