Skip to content

Commit 8712d89

Browse files
committed
Docs: update Elasticsearch support status
1 parent 6597647 commit 8712d89

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ API that allows you to plug in different search backends (such as Solr_,
1010
Elasticsearch_, Whoosh_, Xapian_, etc.) without having to modify your code.
1111

1212
.. _Solr: http://lucene.apache.org/solr/
13-
.. _Elasticsearch: http://elasticsearch.org/
13+
.. _Elasticsearch: https://www.elastic.co/products/elasticsearch
1414
.. _Whoosh: https://bitbucket.org/mchaput/whoosh/
1515
.. _Xapian: http://xapian.org/
1616

docs/backend_support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Elasticsearch
5050
* Stored (non-indexed) fields
5151
* Highlighting
5252
* Spatial search
53-
* Requires: elasticsearch-py > 1.0 & Elasticsearch 1.0+ (Neither Elasticsearch 2.X `#1247 <https://github.com/django-haystack/django-haystack/issues/1247>`_ nor Elasticsearch 5.X `#1383 <https://github.com/django-haystack/django-haystack/issues/1383>`_ are supported yet.)
53+
* Requires: `elasticsearch <https://pypi.python.org/pypi/elasticsearch>`_ 1.x or 2.x. Elasticsearch 5.X is currently unsupported: see `#1383 <https://github.com/django-haystack/django-haystack/issues/1383>`_.
5454

5555
Whoosh
5656
------

docs/installing_search_engines.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ Official Download Location: http://www.elasticsearch.org/download/
114114

115115
Elasticsearch is Java but comes in a pre-packaged form that requires very
116116
little other than the JRE. It's also very performant, scales easily and has
117-
an advanced featureset. Haystack currently only supports ElasticSearch 1.x.
118-
ElasticSearch 2.x is not supported yet, if you would like to help, please see
119-
`#1247 <https://github.com/django-haystack/django-haystack/issues/1247>`_.
117+
an advanced featureset. Haystack currently only supports Elasticsearch 1.x and 2.x.
118+
Elasticsearch 5.x is not supported yet, if you would like to help, please see
119+
`#1383 <https://github.com/django-haystack/django-haystack/issues/1383>`_.
120120

121121
Installation is best done using a package manager::
122122

docs/searchqueryset_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ Example::
304304

305305
# For SOLR (setting f.author.facet.*; see http://wiki.apache.org/solr/SimpleFacetParameters#Parameters)
306306
SearchQuerySet().facet('author', mincount=1, limit=10)
307-
# For ElasticSearch (see http://www.elasticsearch.org/guide/reference/api/search/facets/terms-facet.html)
307+
# For Elasticsearch (see http://www.elasticsearch.org/guide/reference/api/search/facets/terms-facet.html)
308308
SearchQuerySet().facet('author', size=10, order='term')
309309

310310
In the search results you get back, facet counts will be populated in the

0 commit comments

Comments
 (0)