Merge pull request #25 from return42/brand-001

SearxNG brand

3 files changed, 27 insertions, 29 deletions

diff --git a/searx/engines/searx_engine.py b/searx/engines/searx_engine.py
index c4f016adc..98ef0fb79 100644
--- a/searx/engines/searx_engine.py
+++ b/searx/engines/searx_engine.py
@@ -8,9 +8,9 @@ from searx.engines import categories as searx_categories
 
 # about
 about = {
-    "website": 'https://github.com/searx/searx',
+    "website": 'https://github.com/searxng/searxng',
     "wikidata_id": 'Q17639196',
-    "official_api_documentation": 'https://searx.github.io/searx/dev/search_api.html',
+    "official_api_documentation": 'https://searxng.github.io/searxng/dev/search_api.html',
     "use_official_api": True,
     "require_api_key": False,
     "results": 'JSON',
diff --git a/searx/settings.yml b/searx/settings.yml
index 6e106a462..dda03781c 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:
@@ -89,7 +89,7 @@ outgoing: # communication with search engines
 #        - fe80::/126
 
 # External plugin configuration
-# See http://searx.github.io/searx/dev/plugins.html for more details
+# See https://searxng.github.io/searxng/dev/plugins.html for more details
 #
 # plugins:
 #   - plugin1
diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
index 649e66163..72c7b133f 100644
--- a/searx/templates/__common__/about.html
+++ b/searx/templates/__common__/about.html
@@ -1,67 +1,66 @@
 <div{% if rtl %} dir="ltr"{% endif %}>
-  <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
+  <h1>About <a href="{{ url_for('index') }}">searxng</a></h1>
 
   <p>
-    Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
+    SearXNG is a fork from the well-known <a href="https://github.com/searx/searx">searx</a>
+    <a href="https://en.wikipedia.org/wiki/Metasearch_engine"> metasearch engine</a>,
     aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a>
     while not storing information about its users.
   </p>
 
-  <p>More about searx...</p>
+  <p>More about SearXNG ...</p>
 
   <ul>
-    <li><a href="https://github.com/searx/searx">github</a></li>
-    <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
-    <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
+    <li><a href="{{ brand.GIT_URL }}">github</a></li>
     <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
   </ul>
 
   <hr />
 
-  <h2>Why use searx?</h2>
+  <h2>Why use it?</h2>
 
   <ul>
     <li>
-      Searx may not offer you as personalised results as Google, but it doesn't
+      SearXNG may not offer you as personalised results as Google, but it doesn't
       generate a profile about you.
     </li>
     <li>
-      Searx doesn't care about what you search for, never shares anything with a
+      SearXNG doesn't care about what you search for, never shares anything with a
       third party, and it can't be used to compromise you.
     </li>
     <li>
-      Searx is free software, the code is 100% open and you can help to make it
-      better.  See more on <a href="https://github.com/searx/searx">github</a>.
+      SearXNG is free software, the code is 100% open and you can help to make
+      it better.  See more on <a href="{{ brand.GIT_URL }}">github</a>.
     </li>
   </ul>
 
   <p>
     If you do care about privacy, want to be a conscious user, or otherwise
-    believe in digital freedom, make searx your default search engine or run it
-    on your own server
+    believe in digital freedom, make SearXNG your default search engine or run
+    it on your own server
   </p>
 
   <h2>Technical details - How does it work?</h2>
 
   <p>
-    Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
+    SearXNG is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
     inspired by the <a href="https://beniz.github.io/seeks/">seeks project</a>.
 
     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
+
+    SearXNG can be added to your browser's search bar; moreover, it can be set as
     the default search engine.
   </p>
 
   <h2 id='add to browser'>How to set as the default search engine?</h2>
 
   <p>
-    Searx supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.
+    SearXNG supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.
     For more information on changing your default search engine, see your browser's documentation:
   </p>
 
@@ -80,15 +79,14 @@
   <h2>How can I make it my own?</h2>
 
   <p>
-    Searx appreciates your concern regarding logs, so take the
-    code from the <a href="https://github.com/searx/searx">original searx project</a> and
-    run it yourself!
+    SearXNG appreciates your concern regarding logs, so take the code from
+    the <a href="{{ brand.GIT_URL }}">SearXNG project</a> and run it yourself!
   </p>
   <p>
-    Add your searx instance to this <a href="{{ brand.PUBLIC_INSTANCES }}"> list
-    of public searx instances</a> to help other people reclaim their privacy and
-    make the Internet freer! The more decentralized the Internet is, the more
-    freedom we have!
+    Add your instance to this <a href="{{ brand.PUBLIC_INSTANCES }}"> list of
+    public instances</a> to help other people reclaim their privacy and make the
+    Internet freer!  The more decentralized the Internet is, the more freedom we
+    have!
   </p>
 
   <h2>Where are the docs & code of this instance?</h2>