diff options
| 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 |
| commit | 59e9dca55e26b4ea8bd0a52717676c3c794cac5f (patch) | |
| tree | 30fa3aeaef93ea211f6b9104f3b3acb51a55c533 | |
| parent | 0162c3264015286b3d8972df066f5f8eb9431a86 (diff) | |
| download | Chimère-2.0-alpha1.tar.bz2 Chimère-2.0-alpha1.zip | |
Update documentationv2.0-alpha1
| -rw-r--r-- | docs/index.rst | 1 | ||||
| -rw-r--r-- | docs/install-1.x.rst | 9 | ||||
| -rw-r--r-- | docs/install.rst | 8 | ||||
| -rw-r--r-- | example_project/settings.py.example | 3 |
4 files changed, 9 insertions, 12 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 ******************* diff --git a/example_project/settings.py.example b/example_project/settings.py.example index 908dbe1..947d46b 100644 --- a/example_project/settings.py.example +++ b/example_project/settings.py.example @@ -129,7 +129,8 @@ SHARE_NETWORKS = ( # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/' + EXTRA_URL + '/admin-media/' +ADMIN_MEDIA_PREFIX = '/' if EXTRA_URL else '' +ADMIN_MEDIA_PREFIX += EXTRA_URL + '/admin-media/' # Make this unique, and don't share it with anybody. SECRET_KEY = 'achanger_!ToChange!' |