Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-t…

…axonomies

README.rst

@@ -12,12 +12,12 @@ http://ckan.org/.
 Building Documentation
 ======================
 
-1. Install python-sphinx
+1. Install python-sphinx (>= 1.1)
 
 2. Initialize the theme submodule::
 
-   git submodule init
-   git submodule update
+    git submodule init
+    git submodule update
 
 3. Run the command to build the docs::
 

doc/install-from-source.rst

@@ -126,7 +126,7 @@ WebOb has to be installed explicitly afterwards because by installing pylons wit
 Now to install the remaining dependencies in requires/lucid_present.txt and you are using Ubuntu Lucid 10.04 you can install the system versions::
 
     sudo apt-get install python-pybabel python-psycopg2 python-lxml 
-    sudo apt-get install python-sphinx python-pylons python-repoze.who 
+    sudo apt-get install python-pylons python-repoze.who 
     sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface
     
 Alternatively, if you are not using Ubuntu Lucid 10.04 you'll need to install them like this:

requires/lucid_present.txt

@@ -3,13 +3,12 @@
 # you can install these dependencies via pip instead.
 #
 # sudo apt-get install python-pybabel python-psycopg2 python-lxml
-# sudo apt-get install python-sphinx python-pylons python-repoze.who
+# sudo apt-get install python-pylons python-repoze.who
 # sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface
 
 babel==0.9.4
 psycopg2==2.0.13
 lxml==2.2.4
-sphinx==0.6.4
 # Specifying particular version of WebOb because later version has incompatibility
 # with pylons 0.9.7 (change to imports of Multidict)
 webob==1.0.8