summaryrefslogtreecommitdiff
path: root/docs/_build/html/_sources
diff options
context:
space:
mode:
Diffstat (limited to 'docs/_build/html/_sources')
-rw-r--r--docs/_build/html/_sources/administration.txt6
-rw-r--r--docs/_build/html/_sources/configuration.txt13
-rw-r--r--docs/_build/html/_sources/customisation.txt6
-rw-r--r--docs/_build/html/_sources/import_export.txt4
-rw-r--r--docs/_build/html/_sources/install.txt54
5 files changed, 42 insertions, 41 deletions
diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt
index b79c95b..fa95012 100644
--- a/docs/_build/html/_sources/administration.txt
+++ b/docs/_build/html/_sources/administration.txt
@@ -9,14 +9,14 @@ Administration
:date: 2012-11-28
:Copyright: CC-BY 3.0
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
+This document presents the administration of Chimère.
+It has has been updated for version 2.0.0.
Administration pages presentation
---------------------------------
-Administration pages accessible at: http://where_is_your_chimere/admin/
+Administration pages are accessible at: http://where_is_your_chimere/admin/
Don't forget the ending slash in the URL.
diff --git a/docs/_build/html/_sources/configuration.txt b/docs/_build/html/_sources/configuration.txt
index 0565509..39acdfd 100644
--- a/docs/_build/html/_sources/configuration.txt
+++ b/docs/_build/html/_sources/configuration.txt
@@ -8,27 +8,26 @@ Configuration
:date: 2012-10-08
:Copyright: CC-BY 3.0
-This documents presents the first steps to configure your Chimère.
-
-The version has been updated for version 2.0.0.
+This document presents the first steps to configure your Chimère.
+It has been updated for version 2.0.0.
If an usage to the CLI is required, your session has to be initialised with
-theses environment variables::
+these environment variables::
CHIMERE_PATH=/srv/chimere # change with your installation path
CHIMERE_LOCALNAME=mychimere # change with your local project name
CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
-When you have installed the application there is a few simple steps to follow to
+Once the application installed, there are a few simple steps to follow to
configure *your* Chimère.
-Most of theses steps are done in the web administration pages.
+Most of these steps are done in the web administration pages.
If you are not familiar with *Django-like* administration pages you can look
at the first paragraph of :ref:`administration` where it is presented.
-To access theses pages you have to identify you with an account with *staff* and
+To access these pages you have to identify you with an account with *staff* and
*superuser* status.
A *superuser* account is created at the initialization of the database.
diff --git a/docs/_build/html/_sources/customisation.txt b/docs/_build/html/_sources/customisation.txt
index c8ce2f6..e6615db 100644
--- a/docs/_build/html/_sources/customisation.txt
+++ b/docs/_build/html/_sources/customisation.txt
@@ -8,8 +8,8 @@ Customisation
:date: 2012-11-28
:Copyright: CC-BY 3.0
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
+This document presents the installation of Chimère.
+It has been updated for version 2.0.0.
.. _managing-layers:
@@ -45,7 +45,7 @@ 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
+You only need to copy files that you want to modify. These 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 71f9178..e8d283b 100644
--- a/docs/_build/html/_sources/import_export.txt
+++ b/docs/_build/html/_sources/import_export.txt
@@ -8,8 +8,8 @@ Import/export
:date: 2012-11-28
:Copyright: CC-BY 3.0
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
+This document presents the administration of Chimère.
+It has been updated for version 2.0.0.
.. _importing:
diff --git a/docs/_build/html/_sources/install.txt b/docs/_build/html/_sources/install.txt
index 10c333e..f05e5f0 100644
--- a/docs/_build/html/_sources/install.txt
+++ b/docs/_build/html/_sources/install.txt
@@ -8,8 +8,8 @@ Installation
:date: 2012-10-08
:Copyright: CC-BY 3.0
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
+This document presents the installation of Chimère.
+It has been updated for version 2.0.0.
Prerequisites
*************
@@ -26,7 +26,7 @@ Prerequisites
- `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
- python-simplejson
- python-gdal
- - `unidecode <http://pypi.python.org/pypi/Unidecode>_
+ - `unidecode <http://pypi.python.org/pypi/Unidecode>`_
- `lxml <http://lxml.de/>`_
- `jquery <http://jquery.com/>`_ version 1.7.1 or better
- `jquery-ui <http://jqueryui.com/>`_
@@ -37,7 +37,7 @@ geodjango is a part of django since version 1.0 but it has some specific
- `geos <http://trac.osgeo.org/geos/>`_ 3.0.x
- `proj.4 <http://trac.osgeo.org/proj/>`_ 4.4 to 4.6
- - `posgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
+ - `postgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
- `gdal <http://www.gdal.org/>`_
@@ -51,22 +51,24 @@ Optionaly (but recommanded):
The simpliest way to obtain these packages is to get them from your favorite
Linux distribution repositories. For instance on Debian Wheezy::
- apt-get install python python-django python-django-south \
- python-beautifulsoup tinymce apache2 libgeos-3.3.3 proj-bin gdal-bin \
- python-gdal python-lxml python-psycopg2 python-imaging gettext \
- postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
- python-django-celery python-simplejson gpsbabel \
- python-pyexiv2 python-feedparser javascript-common
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-9.1 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ javascript-common python-lxml libjs-jquery libjs-jquery-ui \
+ python-feedparser libgeos-3.3.3 proj-bin postgresql-9.1-postgis \
+ gdal-bin tinymce gpsbabel python-django-celery \
+
On Debian Squeeze (you need to activate backports)::
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 \
- python-psycopg2 python-imaging gettext postgresql-8.4 \
- postgresql-8.4-postgis libjs-jquery libjs-jquery-ui python-simplejson \
- gpsbabel python-pyexiv2 python-feedparser javascript-common
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-8.4 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ javascript-common python-lxml libjs-jquery libjs-jquery-ui \
+ python-feedparser libgeos-3.2.0 proj-bin postgresql-8.4-postgis \
+ gdal-bin tinymce gpsbabel \
If these packages do not exist in your distribution's repository, please refer
@@ -137,7 +139,7 @@ Another solution is to get the last git version::
Create a custom project template
********************************
-There a default project provided "example_project". Copy and modify it (or
+There a default project is provided (example_project). Copy and modify it (or
get another project based on Chimere)::
cd $INSTALL_PATH/chimere
@@ -146,13 +148,13 @@ get another project based on Chimere)::
Your project name is used for the name of the Python package of your template.
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
-significance in Python.
+underscores ("_") to any length. Don't begin the name by "_" because it has
+special significance in Python.
In your chimere application directory create local_settings.py to fit to your
configuration.
A base template is provided (local_settings.py.example) and short descriptions of
-the more relevant fields are given below (at least check them). Most of theses
+the more relevant fields are given below (at least check them). Most of these
settings are initialized in settings.py. ::
cd $INSTALL_PATH/chimere/mychimere_project
@@ -202,13 +204,13 @@ Compiling languages
*******************
If your language is available in the locale directory of chimere, you will just
-need to get it compiled. This can be done with (here, **fr** stands for french).
+need to get it compiled. This can be done with (here, **fr** stands for french.
Replace it with the appropriate language code)::
cd $INSTALL_PATH/chimere/chimere/
django-admin compilemessages
-If your language is not available, feel free to create the default po files and
+If your language is not available, feel free to create the default po file and
to submit it, contributions are well appreciated. Procedure is as follows:
You first need to create the default po file (of course, replace **fr**
@@ -255,10 +257,10 @@ Install mod_wsgi for apache::
TODO: adapt apache-wsgi.conf
+
Create and edit a configuration for Chimère::
- cp $INSTALL_PATH/chimere/apache/django.wsgi \
- $INSTALL_PATH/chimere/apache/mydjango.wsgi
+ cp $INSTALL_PATH/chimere/apache/django.wsgi $INSTALL_PATH/chimere/apache/mydjango.wsgi
vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
vim /etc/apache2/sites-available/chimere
@@ -267,14 +269,14 @@ Create and edit a configuration for Chimère::
Adapt the files *mydjango.wsgi* (with the correct sys path) and Apache *chimere*.
-To activate the website reload apache::
+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
+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