Merge branch 'master' of ssh://git.mysociety.org/data/git/public/djan…

…go-jumpstart

INSTALL

@@ -1,17 +1,18 @@
-Install instructions for django-jumpstart
+Installation instructions for django-jumpstart
 
 == virtualenv ==
 
-Get you virtual env setup so that you have all the dependencies installed:
+Get your virtual environment set up (using virtualenv) so that you have all the
+dependencies installed:
 
   $ virtualenv ../django-jumpstart-virtualenv --no-site-packages
   $ source ../django-jumpstart-virtualenv/bin/activate
   $ pip install -r requirements.txt
 
 == commonlib ==
 
-Get the commonlib submodule, which contains many useful bits used across
-mySociety projects:
+Optionally, get the commonlib submodule, which contains many useful bits used
+across mySociety projects:
 
     $ git submodule add git://git.mysociety.org/commonlib
     $ git submodule sync
@@ -37,4 +38,3 @@ Create your database:
     $ ./manage syncdb
     $ ./manage migrate
 
-

conf/httpd.conf-example

@@ -19,7 +19,6 @@
 #   'example.com', 'exampleuser', 'examplegroup'
 
 Alias /media_root  /data/vhost/example.com/media_root
-Alias /media       /data/vhost/example.com/django-jumpstart-virtualenv/lib/python2.6/site-packages/django/contrib/admin/media
 Alias /static      /data/vhost/example.com/collected_static
 Alias /robots.txt  /data/vhost/example.com/docs/robots.txt
 Alias /favicon.ico /data/vhost/example.com/docs/favicon.ico

django_jumpstart_project/django_jumpstart_app/context_processors.py

@@ -1,4 +1,4 @@
-import settings
+from django.conf import settings
 
 def add_settings( request ):
     """Add some selected settings values to the context"""