summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/admin/installation-apache.rst15
-rw-r--r--docs/admin/installation-nginx.rst10
-rw-r--r--docs/admin/morty.rst15
-rw-r--r--docs/dev/engine_overview.rst2
-rw-r--r--docs/user/search_syntax.rst24
5 files changed, 49 insertions, 17 deletions
diff --git a/docs/admin/installation-apache.rst b/docs/admin/installation-apache.rst
index 217e57718..311b5c250 100644
--- a/docs/admin/installation-apache.rst
+++ b/docs/admin/installation-apache.rst
@@ -180,10 +180,6 @@ modules and create a `Location`_ configuration for the searx site. In most
distributions you have to un-comment the lines in the main configuration file,
except in :ref:`The Debian Layout`.
-To pass the HTTP HOST header
-With ProxyPreserveHost_ the incoming Host HTTP request header is passed to the
-proxied host.
-
.. tabs::
.. group-tab:: Ubuntu / debian
@@ -231,6 +227,11 @@ proxied host.
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_http_module modules/mod_proxy_http.so
+With ProxyPreserveHost_ the incoming Host HTTP request header is passed to the
+proxied host.
+
+.. _apache searx via filtron plus morty:
+
.. tabs::
.. group-tab:: searx via filtron plus morty
@@ -285,15 +286,15 @@ proxied host.
</Location>
- Note that reverse proxy advised to be used in case of single-user or
- low-traffic instances. For a fully result proxification add :ref:`morty's
- <searx morty>` **public URL** to your :origin:`searx/settings.yml`:
+ For a fully result proxification add :ref:`morty's <searx morty>` **public
+ URL** to your :origin:`searx/settings.yml`:
.. code:: yaml
result_proxy:
# replace example.org with your server's public name
url : https://example.org/morty
+ key : !!binary "insert_your_morty_proxy_key_here"
server:
image_proxy : True
diff --git a/docs/admin/installation-nginx.rst b/docs/admin/installation-nginx.rst
index 589c40ada..430ebbcce 100644
--- a/docs/admin/installation-nginx.rst
+++ b/docs/admin/installation-nginx.rst
@@ -163,6 +163,8 @@ Started wiki`_ is always a good resource *to keep in the pocket*.
Create configuration at ``/etc/nginx/conf.d/searx`` and place a
symlink to sites-enabled:
+.. _nginx searx via filtron plus morty:
+
.. tabs::
.. group-tab:: searx via filtron plus morty
@@ -210,21 +212,21 @@ Started wiki`_ is always a good resource *to keep in the pocket*.
proxy_set_header X-Scheme $scheme;
}
- Note that reverse proxy advised to be used in case of single-user or
- low-traffic instances. For a fully result proxification add :ref:`morty's
- <searx morty>` **public URL** to your :origin:`searx/settings.yml`:
+ For a fully result proxification add :ref:`morty's <searx morty>` **public
+ URL** to your :origin:`searx/settings.yml`:
.. code:: yaml
result_proxy:
# replace example.org with your server's public name
url : https://example.org/morty
+ key : !!binary "insert_your_morty_proxy_key_here"
server:
image_proxy : True
- .. group-tab:: proxy or uWSGI
+ .. group-tab:: proxy or uWSGI
Be warned, with this setup, your instance isn't :ref:`protected <searx
filtron>`. Nevertheless it is good enough for intranet usage and it is a
diff --git a/docs/admin/morty.rst b/docs/admin/morty.rst
index 2858fde3c..5468c9c13 100644
--- a/docs/admin/morty.rst
+++ b/docs/admin/morty.rst
@@ -16,15 +16,22 @@ By default searx can only act as an image proxy for result images, but it is
possible to proxify all the result URLs with an external service, morty_.
To use this feature, morty has to be installed and activated in searx's
-``settings.yml``.
-
-Add the following snippet to your ``settings.yml`` and restart searx:
+``settings.yml``. Add the following snippet to your ``settings.yml`` and
+restart searx:
.. code:: yaml
result_proxy:
url : http://127.0.0.1:3000/
- key : your_morty_proxy_key
+ key : !!binary "insert_your_morty_proxy_key_here"
+
+Note that the example above (``http://127.0.0.1:3000``) is only for single-user
+instances without a HTTP proxy. If your morty service is public, the url is the
+address of the reverse proxy (e.g ``https://example.org/morty``).
+
+For more information about *result proxy* have a look at *"searx via filtron
+plus morty"* in the :ref:`nginx <nginx searx via filtron plus morty>` and
+:ref:`apache <apache searx via filtron plus morty>` sections.
``url``
Is the address of the running morty service.
diff --git a/docs/dev/engine_overview.rst b/docs/dev/engine_overview.rst
index 0d2c00e87..7007e7b99 100644
--- a/docs/dev/engine_overview.rst
+++ b/docs/dev/engine_overview.rst
@@ -42,7 +42,6 @@ argument type information
======================= =========== ========================================================
categories list pages, in which the engine is working
paging boolean support multible pages
-language_support boolean support language choosing
time_range_support boolean support search time range
engine_type str ``online`` by default, other possibles values are
``offline``, ``online_dictionnary``, ``online_currency``
@@ -97,7 +96,6 @@ example code
# engine dependent config
categories = ['general']
paging = True
- language_support = True
making a request
diff --git a/docs/user/search_syntax.rst b/docs/user/search_syntax.rst
index b738c7274..57cb51951 100644
--- a/docs/user/search_syntax.rst
+++ b/docs/user/search_syntax.rst
@@ -40,3 +40,27 @@ Image search:
Custom language in wikipedia:
- :search:`:hu !wp hackerspace <?q=%3Ahu%20%21wp%20hackerspace>`
+
+Multilingual Search
+===================
+
+Searx does not support true multilingual search.
+You have to use the language prefix in your search query when searching in a different language.
+
+But there is a workaround:
+By adding a new search engine with a different language, Searx will search in your default and other language.
+
+Example configuration in settings.yml for a German and English speaker:
+ .. code-block:: yaml
+
+ search:
+ language : "de"
+ ...
+
+ engines:
+ - name : google english
+ engine : google
+ language : english
+ ...
+
+When searching, the default google engine will return German results and "google english" will return English results.