Fixed the 'contribute' makefile target.

This makes it much easier to get started when contributing.  The docs
are also updated.

Makefile

@@ -1,7 +1,6 @@
-sandbox:
+contribute:
 	# Create a sandbox installation for playing around with oscar.
-	mkvirtualenv oscar
-	python setup.up develop
+	python setup.py develop
 	pip install -r requirements.txt
 	# Create database
 	sandbox/manage.py syncdb --noinput

docs/source/getting_started.rst

@@ -8,14 +8,14 @@ scratch and have decided to use Oscar.  Let's call this shop 'frobshop'
 .. tip::
 
     You can always review the set-up of the `Sandbox site`_ in case you have
-    trouble following the below instructions.
+    trouble with the below instructions.
 
 .. _`Sandbox site`: https://github.com/tangentlabs/django-oscar/tree/releases/0.2/sandbox
 
 Install by hand
 ===============
 
-Install oscar (which will install Django as a dependency), then create the
+Install Oscar (which will install Django as a dependency), then create the
 project::
 
     pip install django-oscar
@@ -27,7 +27,7 @@ Settings
 --------
 
 Now edit your settings file ``frobshop.frobshop.settings.py`` to specify a
-database (we use sqlite for simplicity)::
+database (we use SQLite for simplicity)::
 
     DATABASES = {
         'default': {
@@ -85,6 +85,9 @@ Oscar currently uses Haystack for search so you need to specify::
     HAYSTACK_SITECONF = 'oscar.search_sites'
     HAYSTACK_SEARCH_ENGINE = 'dummy'
 
+When moving towards production, you'll obviously need to switch to a real search
+backend.
+
 The last addition to the settings file is to import all of Oscar's default settings::
 
     from oscar.defaults import *
@@ -116,7 +119,7 @@ Install using Tangent's boilerplate django project
 ==================================================
 
 The easiest way to get started is to use Tangent's `template django project`_
-although it is tailored to an Agency structure which may not suit everyone.
+although it is tailored to an agency structure which may not suit everyone.
 
 .. _`template django project`: https://github.com/tangentlabs/tangent-django-boilerplate
 
@@ -151,7 +154,8 @@ follows Tangent's conventions.  The structure is::
         deploy-to-stage.sh
         deploy-to-prod.sh
 
-Replace a few files with Oscar-specific versions::
+Replace a few files with Oscar-specific versions (the templated project can be
+used for non-Oscar projects too)::
 
     mv frobshop/www/urls{_oscar,}.py
     mv frobshop/www/deploy/requirements{_oscar,}.py
@@ -173,4 +177,4 @@ Next steps
 ==========
 
 The next step is to implement the business logic of your domain on top of
-Oscar.
+Oscar.  The fun part.

docs/source/take_a_peek.rst

@@ -10,10 +10,10 @@ Browse the sandbox site
 There is a demo Oscar site, built hourly from HEAD of the master branch (unstable):
 http://sandbox.oscar.tangentlabs.co.uk
 
-It is intended to be a vanilla install of oscar, using the default templates and
+It is intended to be a vanilla install of Oscar, using the default templates and
 styles.  This is the blank canvas upon which you an build your application.
 
-It only has two customisations on top of oscar's core:
+It only has two customisations on top of Oscar's core:
 
 * Two shipping methods are specified so that the shipping method step of
   checkout is not skipped.  If there is only one shipping method (which is true of core
@@ -35,19 +35,12 @@ Install Oscar and its dependencies within a virtualenv::
     git clone git://github.com/tangentlabs/django-oscar.git
     cd django-oscar
     mkvirtualenv oscar
-    python setup.py develop
-    pip install -r requirements.txt
+    make contribute
 
-Create a SQLite database and load some sample products and required fixtures::
+This will install all dependencies required for developing Oscar and create a
+simple database populated with products.
 
-    cd sandbox
-    ./manage.py syncdb --noinput
-    ./manage.py migrate 
-    ./manage.py oscar_import_catalogue data/books-catalogue.csv 
-    ./manage.py oscar_import_catalogue_images data/books-images.tar.gz 
-    ./manage.py loaddata countries.json fixtures/pages.json 
-
-Now you can browse a sample Oscar site using Django's development server::
+You can then browse a sample Oscar site using Django's development server::
 
     ./manage.py runserver
 
@@ -61,7 +54,7 @@ as they are domain-specific.  For instance:
 I've found a problem!
 ---------------------
 
-Please `report them in Github's issue tracker`_.
+Good for you - please `report them in Github's issue tracker`_.
 
 .. _`report them in Github's issue tracker`: https://github.com/tangentlabs/django-oscar/issues
 

sandbox/settings.py

@@ -20,7 +20,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'db.sqlite',                      # Or path to database file if using sqlite3.
+        'NAME': os.path.join(os.path.dirname(__file__), 'db.sqlite'),                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.