diff --git a/AUTHORS.rst b/AUTHORS.rst index 57834514b..f3234d809 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,21 +1,16 @@ -Searx was created by Adam Tauber and is maintained by Adam Tauber, Noémi Ványi, @pofilo, Gaspard d'Hautefeuille and Émilien Devos. +searxng is a fork from `searx `_ and is +maintained by Alexandre Flament (`@dalf `_) and Markus +Heiser (`@return42 `_) -Major contributing authors: +People who have submitted patches/translations, reported bugs, consulted +features or generally made searx better: -- Adam Tauber `@asciimoo `_ -- Matej Cotman -- Thomas Pointhuber -- Alexandre Flament `@dalf `_ -- @Cqoicebordel -- Noémi Ványi -- Marc Abonce Seguin @a01200356 -- @pofilo -- Markus Heiser @return42 -- Émilien Devos @unixfox -- Alexandre Flament - -People who have submitted patches/translations, reported bugs, consulted features or -generally made searx better: +- Adam Tauber `@asciimoo `_ +- Émilien Devos `@unixfox `_ +- Thomas Pointhuber `pointhi `_ +- Noémi Ványi `@kvch `_ +- `@Cqoicebordel `_ +- Marc Abonce Seguin `@MarcAbonce `_ - Laszlo Hammerl - Stefan Marsiske diff --git a/searx/settings.yml b/searx/settings.yml index 6e106a462..907f92a0f 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,6 +1,6 @@ general: debug : False # Debug mode, only for development - instance_name : "searx" # displayed name + instance_name : "searxng" # displayed name contact_url: False # mailto:contact@example.com brand: diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 649e66163..3fec8d116 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -1,24 +1,23 @@ -

About searx

+

About searxng

- Searx is a metasearch engine, + SearxNG is a fork from the well-known searx + metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

More about searx...

+

More about searxng ...


-

Why use searx?

+

Why use it?

  • @@ -31,7 +30,7 @@
  • Searx is free software, the code is 100% open and you can help to make it - better. See more on github. + better. See more on github.
@@ -49,11 +48,11 @@ It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request - on every browser (except Chromium-based browsers*). Therefore they show up + on every browser (except Chromium-based browsers*). Therefore they show up in neither our logs, nor your url history. In the case of Chromium-based browser users there is an exception: searx uses the search bar to perform GET requests. - + Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.

@@ -80,9 +79,9 @@

How can I make it my own?

- Searx appreciates your concern regarding logs, so take the - code from the original searx project and - run it yourself! + Searx appreciates your concern regarding logs, so take the code from + the original searx project and run it + yourself!

Add your searx instance to this list diff --git a/tests/robot/__init__.py b/tests/robot/__init__.py index 038a3196f..6e7897118 100644 --- a/tests/robot/__init__.py +++ b/tests/robot/__init__.py @@ -20,7 +20,7 @@ def test_404(browser): def test_about(browser): browser.visit(url) browser.click_link_by_text('about') - assert browser.is_text_present('Why use searx?') + assert browser.is_text_present('Why use it?') def test_preferences(browser): diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index d3498f51a..9d83b7596 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -96,7 +96,7 @@ class ViewsTestCase(SearxTestCase): def test_search_empty_html(self): result = self.app.post('/search', data={'q': ''}) self.assertEqual(result.status_code, 200) - self.assertIn(b'searx', result.data) + self.assertIn(b'searxng', result.data) def test_search_empty_json(self): result = self.app.post('/search', data={'q': '', 'format': 'json'}) @@ -186,7 +186,7 @@ class ViewsTestCase(SearxTestCase): def test_about(self): result = self.app.get('/about') self.assertEqual(result.status_code, 200) - self.assertIn(b'

About searx

', result.data) + self.assertIn(b'

About searxng

', result.data) def test_preferences(self): result = self.app.get('/preferences')