Merge branch 'master' of github.com:datagovuk/ckan

Conflicts:
	ckan/lib/base.py
	ckan/lib/search/__init__.py
	doc/solr-setup.rst

doc/solr-setup.rst

@@ -212,17 +212,17 @@ Some problems that can be found during the install:
 
     <dataDir>${dataDir}</dataDir>
 
-* When running Solr it says ``Unable to find a javac compiler; com.sun.tools.javac.Main is not on the classpath. Perhaps JAVA_HOME does not point to the JDK.``
-
-  See the note above about ``JAVA_HOME``. Alternatively you may not have installed the JDK. Check by seeing if javac is installed::
+* When running Solr it says `Unable to find a javac compiler; com.sun.tools.javac.Main is not on the classpath. Perhaps JAVA_HOME does not point to the JDK.`
 
+ See the note above about JAVA_HOME. Alternatively you may not have installed the JDK. Check by seeing if javac is installed::
+   
      which javac
 
-  If it isn't do::
+ If it isn't do::
 
      sudo apt-get install openjdk-6-jdk
 
-  and restart Solr.
+ and restart SOLR.
 
 Handling changes in the CKAN schema
 -----------------------------------