diff options
| author | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
|---|---|---|
| committer | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
| commit | 55a5b686ed6dc0b9a6bfc45e0eaf1f70e24f2aea (patch) | |
| tree | 96e953057dd3fc29681039f7ac5b282dac189ee8 /searx/settings.yml | |
| parent | 6f87bf2a1c76f1b94ad2119df7fb938c2307e370 (diff) | |
| parent | 295fc9ce96d8cca9c6c4776a00e5fb0942eb6f4d (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
Resolved conflict searx/settings.yml
Diffstat (limited to 'searx/settings.yml')
| -rw-r--r-- | searx/settings.yml | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/searx/settings.yml b/searx/settings.yml index b13a38336..2846b2a0d 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -25,7 +25,7 @@ outgoing: # communication with search engines pool_maxsize : 10 # Number of simultaneous requests by host # uncomment below section if you want to use a proxy # see http://docs.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are not supported : see https://github.com/kennethreitz/requests/pull/478 +# SOCKS proxies are also supported: see http://docs.python-requests.org/en/master/user/advanced/#socks # proxies : # http : http://127.0.0.1:8080 # https: http://127.0.0.1:8080 @@ -377,7 +377,7 @@ engines: timeout : 10.0 disabled : True - - name : scanr_structures + - name : scanr structures shortcut: scs engine : scanr_structures disabled : True @@ -450,9 +450,9 @@ engines: # - name : urbandictionary # engine : xpath # search_url : http://www.urbandictionary.com/define.php?term={query} -# url_xpath : //div[@class="word"]//a/@href -# title_xpath : //div[@class="word"]//a -# content_xpath : //div[@class="definition"] +# url_xpath : //*[@class="word"]/@href +# title_xpath : //*[@class="def-header"] +# content_xpath : //*[@class="meaning"] # shortcut : ud - name : yahoo @@ -500,6 +500,19 @@ engines: shortcut: speu disabled: True + - name : dictzone + engine : dictzone + shortcut : dc + + - name : mymemory translated + engine : translated + shortcut : tl + timeout : 5.0 + disabled : True + # You can use without an API key, but you are limited to 1000 words/day + # See : http://mymemory.translated.net/doc/usagelimits.php + # api_key : '' + #The blekko technology and team have joined IBM Watson! -> https://blekko.com/ # - name : blekko images # engine : blekko_images |