Merge pull request django-haystack#1608 from erez-o/master

Edited docs for Solr 6.X

Author: acdha

docs/installing_search_engines.rst

@@ -17,9 +17,11 @@ Solr 4.x+ with a little effort. Installation is relatively simple:
 For Solr 6.X::
 
     curl -LO https://archive.apache.org/dist/lucene/solr/x.Y.0/solr-X.Y.0.tgz
+    mkdir solr
     tar -C solr -xf solr-X.Y.0.tgz --strip-components=1
     cd solr
-    ./bin/solr create -c tester -n basic_config
+    ./bin/solr start                                    # start solr
+    ./bin/solr create -c tester -n basic_config         # create core named 'tester'
 
 By default this will create a core with a managed schema.  This setup is dynamic
 but not useful for haystack, and we'll need to configure solr to use a static

docs/tutorial.rst

@@ -112,7 +112,7 @@ the following:
 Solr
 ~~~~
 
-Example::
+Example (Solr 4.X)::
 
     HAYSTACK_CONNECTIONS = {
         'default': {
@@ -123,6 +123,17 @@ Example::
         },
     }
 
+Example (Solr 6.X)::
+
+    HAYSTACK_CONNECTIONS = {
+        'default': {
+            'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
+            'URL': 'http://127.0.0.1:8983/solr/tester',                 # Assuming you created a core named 'tester' as described in installing search engines.
+            'ADMIN_URL': 'http://127.0.0.1:8983/solr/admin/cores'
+            # ...or for multicore...
+            # 'URL': 'http://127.0.0.1:8983/solr/mysite',
+        },
+    }
 
 Elasticsearch
 ~~~~~~~~~~~~~
@@ -147,6 +158,7 @@ Example (ElasticSearch 2.x)::
         },
     }
 
+
 Whoosh
 ~~~~~~