summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt9
-rw-r--r--docs/spelling_wordlist1
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 199a864566..964d6eeccf 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1392,9 +1392,9 @@ templates used by the :class:`ModelAdmin` views:
This method may be overridden with your own custom search method. For
example, you might wish to search by an integer field, or use an external
- tool such as Solr or Haystack. You must establish if the queryset changes
- implemented by your search method may introduce duplicates into the results,
- and return ``True`` in the second element of the return value.
+ tool such as `Solr`_ or `Haystack`_. You must establish if the queryset
+ changes implemented by your search method may introduce duplicates into the
+ results, and return ``True`` in the second element of the return value.
For example, to search by ``name`` and ``age``, you could use::
@@ -1435,6 +1435,9 @@ templates used by the :class:`ModelAdmin` views:
See the :ref:`spanning-multi-valued-relationships` topic for more
discussion of this difference.
+.. _Solr: https://solr.apache.org
+.. _Haystack: https://haystacksearch.org
+
.. method:: ModelAdmin.save_related(request, form, formsets, change)
The ``save_related`` method is given the ``HttpRequest``, the parent
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index b907e044e1..f4946a5541 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -456,7 +456,6 @@ sitewide
sliceable
SMTP
solaris
-Solr
sortable
Spectre
Springmeyer