diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-06-01 09:25:30 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-06-01 09:25:30 +0200 |
| commit | 6fc26775e4aafcf655e493fe0469341bd2b093ef (patch) | |
| tree | 527ed084726f05c94b5377d47650b85e50c8f804 /docs/admin | |
| parent | f576cadfba11dd96788f5c70e63fba4a70899584 (diff) | |
| parent | 19e32dc686e40f5e7ec1653f4a05aaa75cb17d80 (diff) | |
| download | searxng-6fc26775e4aafcf655e493fe0469341bd2b093ef.tar.gz searxng-6fc26775e4aafcf655e493fe0469341bd2b093ef.zip | |
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
Diffstat (limited to 'docs/admin')
| -rw-r--r-- | docs/admin/engines.rst | 4 | ||||
| -rw-r--r-- | docs/admin/settings.rst | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/admin/engines.rst b/docs/admin/engines.rst index 4b78c8c2b..4d1872dfc 100644 --- a/docs/admin/engines.rst +++ b/docs/admin/engines.rst @@ -26,6 +26,8 @@ Safe search **SS** Weigth **W** ------------- ----------- --------------------------------- Disabled **D** +------------- ----------- --------------------------------- +Show errors **DE** ============= =========== ================================= Configuration defaults (at built time): @@ -51,6 +53,7 @@ Configuration defaults (at built time): - O - W - D + - DE {% for name, mod in engines.items() %} @@ -67,5 +70,6 @@ Configuration defaults (at built time): - {{(mod.offline and "y") or ""}} - {{mod.weight or 1 }} - {{(mod.disabled and "y") or ""}} + - {{(mod.display_error_messages and "y") or ""}} {% endfor %} diff --git a/docs/admin/settings.rst b/docs/admin/settings.rst index 59a406a28..8b1cb8dca 100644 --- a/docs/admin/settings.rst +++ b/docs/admin/settings.rst @@ -104,7 +104,7 @@ Global Settings specific instance of searx, a locale can be defined using an ISO language code, like ``fr``, ``en``, ``de``. -.. _requests proxies: http://docs.python-requests.org/en/latest/user/advanced/#proxies +.. _requests proxies: http://requests.readthedocs.io/en/latest/user/advanced/#proxies .. _PR SOCKS support: https://github.com/kennethreitz/requests/pull/478 ``outgoing_proxies`` : @@ -181,6 +181,9 @@ Engine settings ``weigth`` : default ``1`` Weighting of the results of this engine. +``display_error_messages`` : default ``True`` + When an engine returns an error, the message is displayed on the user interface. + .. note:: A few more options are possible, but they are pretty specific to some |