Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoffs.html
	templates/public/about.html
	templates/public/download.html
	templates/public/index.html
	templates/public/svn.html
	templates/releng/results.html
	templates/todolists/view.html

1 files changed, 9 insertions, 8 deletions

diff --git a/README b/README
index 184d1c8a..0d3ee082 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ See AUTHORS file.
 
 # Dependencies
 
-- python
-- python-virtualenv
+- python2
+- python2-virtualenv
 
 # Python dependencies
 
@@ -31,13 +31,13 @@ packages, you will probably want the following:
 
 # Testing Installation
 
-1. Run `virtualenv`.
+1. Run `virtualenv2`.
 
-        $ cd /path/to/archweb && virtualenv ../archweb-env
+        $ cd /path/to/archweb && virtualenv2 ../archweb-env
 
-2. Source the virtualenv.
+2. Activate the virtualenv.
 
-        $ . ../archweb-env/bin/activate
+        $ source ../archweb-env/bin/activate
 
 2. Install dependencies through `pip`.
 
@@ -58,7 +58,7 @@ packages, you will probably want the following:
    provided data, adjust the file glob accordingly.
 
         (archweb-env) $ ./manage.py loaddata */fixtures/*.json
-    
+
 7. Use the following commands to start a service instance
 
         (archweb-env) $ ./manage.py runserver
@@ -69,7 +69,8 @@ packages, you will probably want the following:
         (archweb-env) $ ./manage.py reporead i686 core.db.tar.gz
         (archweb-env) $ ./manage.py syncisos
 
-Alter architecture and repo to get x86\_64 and packages from other repos if needed.
+Alter architecture and repo to get x86\_64 and packages from other repos if
+needed.
 
 # Production Installation