From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 21 Aug 2013 11:08:00 +0000 (+0200)
Subject: Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
X-Git-Tag: myslice-0.2-1~41^2~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33438ecdb2c04d0a861ddbbd26f8ac6bde8e4583;hp=8476d7d432f712af498211268c0dbd2a26170301;p=myslice.git

Merge branch 'jordan' of git://git.onelab.eu/myslice into jordan
---

diff --git a/README b/README
index 3d436f5d..175e65b0 100644
--- a/README
+++ b/README
@@ -13,7 +13,6 @@ See the devel/ subdir for more devel-oriented doc.
 * git clone ssh://yourlogin@git.onelab.eu/git/myslice-django.git
 
 * edit myslice/settings.py and
-** change DEVELOPER_ROOT if you didnt clone into ~/git/myslice-django
 ** change the location of your backend API (not yet supported)
 
 * edit myslice/config.py and enter the details of your manifold backend
@@ -22,7 +21,7 @@ See the devel/ subdir for more devel-oriented doc.
 $ manage.py syncdb
 
 * gather static files
-$ make static
+$ ./manage.py collectstatic (formerly, we used make static, which is deprecated)
 
 * run a local server:
 $ manage.py runserver 0.0.0.0:8000