From 3dac3aa1a580f04376a1c16d2416f34351b14adb Mon Sep 17 00:00:00 2001
From: Nawa <bellefeegore@follepensee.net>
Date: Thu, 29 Nov 2012 23:54:29 +0100
Subject: Documentation: new corrections, mainly on the administration part

---
 docs/_build/html/upgrade.html | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'docs/_build/html/upgrade.html')

diff --git a/docs/_build/html/upgrade.html b/docs/_build/html/upgrade.html
index d0cd08f..c38cc8f 100644
--- a/docs/_build/html/upgrade.html
+++ b/docs/_build/html/upgrade.html
@@ -62,6 +62,8 @@
 </tr>
 </tbody>
 </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
@@ -73,8 +75,8 @@ 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>
-<div class="section" id="get-new-version-of-dependencies">
-<h2>Get new version of dependencies<a class="headerlink" href="#get-new-version-of-dependencies" title="Permalink to this headline">¶</a></h2>
+<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">
 <h3>Version 1.1 -&gt; 1.2<a class="headerlink" href="#version-1-1-1-2" title="Permalink to this headline">¶</a></h3>
 <div class="highlight-bash"><div class="highlight"><pre>apt-get install python-lxml libjs-jquery gpsbabel python-gdal
@@ -105,8 +107,8 @@ Then install the new dependencies:</p>
 </div>
 </div>
 </div>
-<div class="section" id="get-the-new-sources">
-<h2>Get the new sources<a class="headerlink" href="#get-the-new-sources" title="Permalink to this headline">¶</a></h2>
+<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
 repository.</p>
@@ -138,7 +140,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>Remove first 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>
@@ -236,7 +238,7 @@ configuration file to point to the correct settings:
 <div class="section" id="id3">
 <h3>Version 1.1 -&gt; 1.2<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
 <p>Migration scripts test your installation before making changes so you probably
-won&#8217;t have any lost but by precaution before running theses scripts don&#8217;t forget
+won&#8217;t have any lost but by precaution before running these scripts don&#8217;t forget
 to backup your database.
 You can also make a copy of your current database into a new database and make
 the new installation to this new database.</p>
@@ -296,8 +298,8 @@ django-admin compilemessages
 </div>
 </div>
 </div>
-<div class="section" id="force-the-upgrade-of-visitor-s-web-browser-cache">
-<h2>Force the upgrade of visitor&#8217;s web browser cache<a class="headerlink" href="#force-the-upgrade-of-visitor-s-web-browser-cache" title="Permalink to this headline">¶</a></h2>
+<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
 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
@@ -327,7 +329,7 @@ ln -s <span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</sp
   <h3><a href="index.html">Table Of Contents</a></h3>
   <ul>
 <li><a class="reference internal" href="#">Upgrade</a><ul>
-<li><a class="reference internal" href="#get-new-version-of-dependencies">Get new version of dependencies</a><ul>
+<li><a class="reference internal" href="#getting-new-versions-of-dependencies">Getting new versions of dependencies</a><ul>
 <li><a class="reference internal" href="#version-1-1-1-2">Version 1.1 -&gt; 1.2</a></li>
 <li><a class="reference internal" href="#version-1-2-2-0">Version 1.2 -&gt; 2.0</a><ul>
 <li><a class="reference internal" href="#debian-squeeze">Debian Squeeze</a></li>
@@ -336,7 +338,7 @@ ln -s <span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</sp
 </li>
 </ul>
 </li>
-<li><a class="reference internal" href="#get-the-new-sources">Get the new sources</a><ul>
+<li><a class="reference internal" href="#getting-the-new-sources">Getting the new sources</a><ul>
 <li><a class="reference internal" href="#from-a-previous-git-installation">From a previous Git installation</a></li>
 <li><a class="reference internal" href="#from-a-previous-tarball-installation">From a previous tarball installation</a></li>
 <li><a class="reference internal" href="#update-basic-settings">Update basic settings</a><ul>
@@ -365,7 +367,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="#force-the-upgrade-of-visitor-s-web-browser-cache">Force the upgrade of visitor&#8217;s web browser cache</a></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>
 </ul>
 </li>
 </ul>
-- 
cgit v1.2.3