more merge

1 files changed, 14 insertions, 10 deletions

diff --git a/README b/README
index dc43e9da..6b492d84 100644
--- a/README
+++ b/README
@@ -33,37 +33,41 @@ packages, you will probably want the following:
 
 1. Run `virtualenv`.
 
-        $ cd /path/to/archweb && virtualenv ../archweb
+        $ cd /path/to/archweb && virtualenv ../archweb-env
+
+2. Source the virtualenv.
+
+        $ . ../archweb-env/bin/activate
 
 2. Install dependencies through `pip`.
 
-        $ pip install -r requirements.txt
+        (archweb-env) $ pip install -r requirements.txt
 
 3. Copy `local_settings.py.example` to `local_settings.py` and modify.
    Make sure to uncomment the appropriate db section (either sqlite or mysql).
 
 4. Sync the database to create it.
 
-        $ ./manage.py syncdb
+        (archweb-env) $ ./manage.py syncdb
 
 5. Migrate changes.
 
-        $ ./manage.py migrate
+        (archweb-env) $ ./manage.py migrate
 
 6. Load the fixtures to prepopulate some data.
 
-        $ ./manage.py loaddata main/fixtures/arches.json
-        # ./manage.py loaddata main/fixtures/repos.json
-        # ./manage.py loaddata mirrors/fixtures/mirrorprotocols.json
+        (archweb-env) $ ./manage.py loaddata main/fixtures/arches.json
+        (archweb-env) $ ./manage.py loaddata main/fixtures/repos.json
+        (archweb-env) $ ./manage.py loaddata mirrors/fixtures/mirrorprotocols.json
     
 7. Use the following commands to start a service instance
 
-        $ ./manage.py runserver
+        (archweb-env) $ ./manage.py runserver
 
 8. To optionally populate the database with real data:
 
-        $ wget ftp://ftp.archlinux.org/core/os/i686/core.db.tar.gz
-        $ ./manage.py reporead i686 core.db.tar.gz
+        (archweb-env) $ wget ftp://ftp.archlinux.org/core/os/i686/core.db.tar.gz
+        (archweb-env) $ ./manage.py reporead i686 core.db.tar.gz
 
 Alter architecture and repo to get x86\_64 and packages from other repos if needed.