summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-03-10 12:31:58 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-03-10 12:31:58 +0100
commit59e9dca55e26b4ea8bd0a52717676c3c794cac5f (patch)
tree30fa3aeaef93ea211f6b9104f3b3acb51a55c533 /docs
parent0162c3264015286b3d8972df066f5f8eb9431a86 (diff)
downloadChimère-59e9dca55e26b4ea8bd0a52717676c3c794cac5f.tar.bz2
Chimère-59e9dca55e26b4ea8bd0a52717676c3c794cac5f.zip
Update documentationv2.0-alpha1
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst1
-rw-r--r--docs/install-1.x.rst9
-rw-r--r--docs/install.rst8
3 files changed, 7 insertions, 11 deletions
diff --git a/docs/index.rst b/docs/index.rst
index dfeab7f..897c158 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,6 +13,7 @@ Contents:
install
upgrade
+ install-1.x
Indices and tables
==================
diff --git a/docs/install-1.x.rst b/docs/install-1.x.rst
index b31ac25..4c8a5b8 100644
--- a/docs/install-1.x.rst
+++ b/docs/install-1.x.rst
@@ -1,14 +1,15 @@
.. -*- coding: utf-8 -*-
-====================
-Chimère installation
-====================
+========================================
+Chimère installation (old documentation)
+========================================
:Author: Étienne Loks
:date: 2012-02-15
:Copyright: CC-BY 3.0
-This documents presents the installation of Chimère.
+This documents presents the installation of Chimère for version 1.x. This
+documentation is no longer relevant for version 2.
-----------------
Base installation
diff --git a/docs/install.rst b/docs/install.rst
index 3bc4b31..4b8ae63 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -87,7 +87,7 @@ Choose a path to install your Chimère::
From an archive
+++++++++++++++
-The last "stable" version is available in this `directory <http://www.peacefrogs.net/download/>`_.
+The last "stable" version is available in this `directory <http://www.peacefrogs.net/download/chimere/>`_.
Download, unpack and move the files in an apache user (www-data for Debian)
readable directory::
@@ -155,12 +155,6 @@ the more relevant fields are given below (at least check them)::
* ROOT_URLCONF: url configuration for your project something like:
'mychimere_project.urls'
-In this same chimere directory, make a symbolic link to django's basic styles
-(do not forget to change the path according to your configuration)::
-
- cd $INSTALL_PATH/chimere/mychimere_project
- ln -s /usr/share/pyshared/django/contrib/admin/media/ .
-
Compiling languages
*******************