[ckan-changes] [okfn/ckan] ccd89d: [doc][xs] Nicer fix for SOLR JDK startup issue

Sun Apr 29 16:19:39 UTC 2012

Branch: refs/heads/release-v1.7
  Home:   https://github.com/okfn/ckan
  Commit: ccd89d8ee86e262d5412724c4503836b63e29a8b
      https://github.com/okfn/ckan/commit/ccd89d8ee86e262d5412724c4503836b63e29a8b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [doc][xs] Nicer fix for SOLR JDK startup issue

diff --git a/doc/solr-setup.rst b/doc/solr-setup.rst
index 3c158b2..395da67 100644
--- a/doc/solr-setup.rst
+++ b/doc/solr-setup.rst
@@ -50,13 +50,12 @@ and the admin site::
 
  http://localhost:8983/solr/admin
 
-.. note:: If you get the message `Could not start Jetty servlet engine because no Java Development Kit (JDK) was found.` then you will have to edit /etc/profile and add this line to the end such as this to the end (adjusting the path for your machine's jdk install):
+.. note:: If you get the message ``Could not start Jetty servlet engine because no Java Development Kit (JDK) was found.`` then you will have to edit the ``JAVA_HOME`` setting in ``/etc/default/jetty`` (adjusting the path for your machine's JDK install):
 
     ``JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/``
 
 Now run::
 
-       export JAVA_HOME
        sudo service jetty start
 
 


================================================================

