fixed ubuntu-18.04 support

ckan · Oct 18, 2018 · e31341a · e31341a
1 parent 59f8272
commit e31341a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/doc/maintaining/installing/install-from-source.rst b/doc/maintaining/installing/install-from-source.rst
@@ -79,6 +79,17 @@ a. Create a Python `virtual environment <http://www.virtualenv.org>`_
 
    .. parsed-literal::
 
+       sudo mkdir -p |virtualenv|
+       sudo chown \`whoami\` |virtualenv|
+       virtualenv --no-site-packages |virtualenv|
+       |activate|
+    
+    .. note::
+
+       If you are using ``python3`` and if you are having problems installing the
+       requirements using ``pip`` inside the virtual environment, explicitly
+       install ``python2.7`` inside the virtual environment. 
+
        sudo mkdir -p |virtualenv|
        sudo chown \`whoami\` |virtualenv|
        virtualenv --python=/usr/bin/python2.7 --no-site-packages |virtualenv|

diff --git a/doc/maintaining/installing/solr.rst b/doc/maintaining/installing/solr.rst
@@ -12,7 +12,7 @@ installed, we need to install and configure Solr.
    server, but CKAN doesn't require Jetty - you can deploy Solr to another web
    server, such as Tomcat, if that's convenient on your operating system.
 
-.. important::
+.. tip::
 
    Do this step only if your system is using ``jetty9``.
 
@@ -105,4 +105,4 @@ installed, we need to install and configure Solr.
 #. Finally, change the :ref:`solr_url` setting in your :ref:`config_file` (|production.ini|) to
    point to your Solr server, for example::
 
-       solr_url=http://127.0.0.1:8983/solr
+       solr_url=http://127.0.0.1:8983/solr