Move around stuff in README.{develop,deploy}

README.deploy

@@ -3,9 +3,38 @@ DEPLOYMENT notes
 
 This document describes the services that comprise the Synnefo software
 infrastructure and the dependencies among them. This document applies
-to Synnefo v0.3.
-
+to Synnefo v0.4.
+
+- Software dependencies
+
+  Synnefo is written in Python 2.6 and depends on the following Python modules
+  [package versions confirmed to be compatible are in braces]
+  
+    * django 1.2 [Django==1.2.4]
+    * simplejson [simplejson==2.1.3]
+    * pycurl [pycurl==7.19.0]
+    * python-dateutil  [python-dateutil==1.4.1]
+      WARNING: version python-dateutil==2.0 downloaded by pip known *not* to work
+               with Python 2.6
+    * south [south==0.7.1]
+      WARNING: not working with Debian squeeze's default south-0.7-1 package.
+    * amqplib [amqplib==0.6.1]
     
+  also, depending on the database engine of choice, on one of the following:
+    * MySQL-python [MySQL-python==1.2.3]
+    * psycopg2 [psycopg2==2.4]
+  
+  if the invitations application is deployed, the following
+  dependencies should be installed
+  
+    * pycrypto==2.1.0
+  
+  if you want to test the ganeti (FIXME)
+  
+  to run the user interface tests, selenium must be installed
+    * selenium [?]
+  
+
 - Node types
 
   Nodes in a Synnefo deployment belong in one of the following types:
@@ -145,8 +174,7 @@ to Synnefo v0.3.
       daemon must be running on every node of type WEBSERVER.
 
       Download and install vncauthproxy from its own repository,
-      at https://code.grnet.gr/git/vncauthproxy
-      (known good commit [FIXME for v0.3]: 48b1400e).
+      at https://code.grnet.gr/git/vncauthproxy (known good commit: 8799ab6d6e).
 
       Edit default settings on top of vncauthproxy.py.
       Set CTRL_SOCKET in util/vapclient.py to point to its control socket.

README.develop

 DEVELOP.txt - Information on how to setup a development environment. 
 
-Dependencies
-------------
-
-Synnefo is written in Python 2.6 and depends on the following Python modules
-[package versions confirmed to be compatible are in braces]
-
-- django 1.2 [Django==1.2.4]
-- simplejson [simplejson==2.1.3]
-- pycurl [pycurl==7.19.0]
-- python-dateutil  [python-dateutil==1.4.1]
-  WARNING: version python-dateutil==2.0 downloaded by pip known *not* to work
-           with Python 2.6
-- south [south==0.7.1]
-  WARNING: not working with Debian squeeze's default south-0.7-1 package.
-- amqplib [amqplib==0.6.1]
-
-also, depending on the database engine of choice, on one of the following:
-- MySQL-python [MySQL-python==1.2.3]
-- psycopg2 [psycopg2==2.4]
-
-if the invitations application is deployed, the following
-dependencies should be installed
-
-- pycrypto==2.1.0
-
-if you want to test the ganeti (FIXME)
-
-to run the user interface tests, selenium must be installed
-- selenium [?]
-
 Preparing the development environment
 -------------------------------------
 
+0. Please see file README.deploy for a list of software packages Synnefo
+depends on.
+
 1. Prepare the system: The easiest method is to setup a working environment
 through virtualenv. Alternatively, you can use your system's package manager
 to install the dependencies (e.g. Macports has them all).