[release-v1.5.1][doc][s]: Tidy up of docs. Upgrade now covered in ins…

…tall-from-package.rst. ckanclient dependency was not mentioned for tests - solved by using pip-requirements-test.txt. SOLR Core directories needed making.

doc/solr-setup.rst

@@ -109,7 +109,10 @@ This is how cores are defined::
     </solr>
 
 Note that each core has its own data directory. This is really important to
-prevent conflicts between cores.
+prevent conflicts between cores. Create them like this::
+
+    sudo mkdir /var/lib/solr/data/core0
+    sudo mkdir /var/lib/solr/data/core1
 
 For each core, we will create a folder with its name in `/usr/share/solr`,
 with a symbolic link to a specific configuration folder in `/etc/solr/`.

doc/test.rst

@@ -17,9 +17,9 @@ Make sure you've created a config file at ``pyenv/ckan/development.ini``. Then a
 
     . pyenv/bin/activate
 
-Install nose into your virtual environment::
+Install nose and other test-specific dependencies into your virtual environment::
 
-    pip install --ignore-installed nose
+    pip install --ignore-installed -r pyenv/src/ckan/pip-requirements-test.txt
 
 At this point you will need to deactivate and then re-activate your
 virtual environment to ensure that all the scripts point to the correct

pip-requirements-test.txt

@@ -1,3 +1,4 @@
 # These are packages that required when running ckan tests
 
+nose
 -e hg+https://bitbucket.org/okfn/ckanclient#egg=ckanclient