Browse Source

Merge pull request #17 from searxng/searxng

searxng brand
Alexandre Flament 4 years ago
parent
commit
e8c2fbc433
4 changed files with 30 additions and 48 deletions
  1. 12 32
      README.rst
  2. 9 6
      docs/index.rst
  3. 4 5
      searx/settings.yml
  4. 5 5
      utils/brand.env

+ 12 - 32
README.rst

@@ -1,8 +1,8 @@
 .. SPDX-License-Identifier: AGPL-3.0-or-later
 .. SPDX-License-Identifier: AGPL-3.0-or-later
 
 
 .. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png
 .. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png
-   :target: https://searx.github.io/searx/
-   :alt: searX
+   :target: https://searx.github.io/searxng/
+   :alt: searXNG
    :width: 100%
    :width: 100%
    :align: center
    :align: center
 
 
@@ -14,10 +14,8 @@
 |AGPL License|
 |AGPL License|
 |Issues|
 |Issues|
 |commits|
 |commits|
-|OpenCollective searx backers|
-|OpenCollective searx sponsors|
 
 
-Privacy-respecting, hackable `metasearch engine`_ / *pronunciation* **səːks**.
+Privacy-respecting, hackable `metasearch engine`_
 
 
 .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine
 .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine
 
 
@@ -25,28 +23,22 @@ Privacy-respecting, hackable `metasearch engine`_ / *pronunciation* **səːks**.
    :target: https://searx.github.io/searx/admin/installation.html
    :target: https://searx.github.io/searx/admin/installation.html
 
 
 .. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue
 .. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue
-   :target: https://searx.github.io/searx
+   :target: https://searxng.github.io/searxng
 
 
 .. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue
 .. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue
-   :target: https://github.com/searx/searx/wiki
+   :target: https://github.com/searxng/searxng/wiki
 
 
 .. |AGPL License|  image:: https://img.shields.io/badge/license-AGPL-blue.svg
 .. |AGPL License|  image:: https://img.shields.io/badge/license-AGPL-blue.svg
    :target: https://github.com/searx/searx/blob/master/LICENSE
    :target: https://github.com/searx/searx/blob/master/LICENSE
 
 
 .. |Issues| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues
 .. |Issues| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues
-   :target: https://github.com/searx/searx/issues
+   :target: https://github.com/searxng/searxng/issues
 
 
 .. |PR| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR
 .. |PR| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR
-   :target: https://github.com/searx/searx/pulls
+   :target: https://github.com/searxng/searxng/pulls
 
 
 .. |commits| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits
 .. |commits| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits
-   :target: https://github.com/searx/searx/commits/master
-
-.. |OpenCollective searx backers| image:: https://opencollective.com/searx/backers/badge.svg
-   :target: https://opencollective.com/searx#backer
-
-.. |OpenCollective searx sponsors| image:: https://opencollective.com/searx/sponsors/badge.svg
-   :target: https://opencollective.com/searx#sponsor
+   :target: https://github.com/searxng/searxng/commits/master
 
 
 
 
 If you are looking for running instances, ready to use, then visit searx.space_.
 If you are looking for running instances, ready to use, then visit searx.space_.
@@ -55,19 +47,7 @@ Otherwise jump to the user_, admin_ and developer_ handbooks you will find on
 our homepage_.
 our homepage_.
 
 
 .. _searx.space: https://searx.space
 .. _searx.space: https://searx.space
-.. _user: https://searx.github.io/searx/user
-.. _admin: https://searx.github.io/searx/admin
-.. _developer: https://searx.github.io/searx/dev
-.. _homepage: https://searx.github.io/searx
-
-contact:
-  openhub_ // twitter_ // IRC: #searx @ freenode
-
-.. _openhub: https://www.openhub.net/p/searx
-.. _twitter: https://twitter.com/Searx_engine
-
--------
-
-|gluten free|
-
-.. |gluten free| image:: https://forthebadge.com/images/featured/featured-gluten-free.svg
+.. _user: https://searx.github.io/searxng/user
+.. _admin: https://searx.github.io/searxng/admin
+.. _developer: https://searx.github.io/searxng/dev
+.. _homepage: https://searx.github.io/searxng

+ 9 - 6
docs/index.rst

@@ -1,14 +1,17 @@
-================
-Welcome to searx
-================
+==================
+Welcome to searxng
+==================
 
 
     *Search without being tracked.*
     *Search without being tracked.*
 
 
-Searx is a free internet metasearch engine which aggregates results from more
+.. warning::
+   This is not searx, but searxng.
+
+Searxng is a free internet metasearch engine which aggregates results from more
 than 70 search services.  Users are neither tracked nor profiled.  Additionally,
 than 70 search services.  Users are neither tracked nor profiled.  Additionally,
-searx can be used over Tor for online anonymity.
+searxng can be used over Tor for online anonymity.
 
 
-Get started with searx by using one of the Searx-instances_.  If you don't trust
+Get started with searxng by using one of the Searx-instances_.  If you don't trust
 anyone, you can set up your own, see :ref:`installation`.
 anyone, you can set up your own, see :ref:`installation`.
 
 
 .. sidebar::  Features
 .. sidebar::  Features

+ 4 - 5
searx/settings.yml

@@ -4,13 +4,12 @@ general:
     contact_url: False # mailto:contact@example.com
     contact_url: False # mailto:contact@example.com
 
 
 brand:
 brand:
-    git_url: https://github.com/searx/searx
+    git_url: https://github.com/searxng/searxng
     git_branch: master
     git_branch: master
-    issue_url: https://github.com/searx/searx/issues
-    docs_url: https://searx.github.io/searx
+    issue_url: https://github.com/searxng/searxng/issues
+    docs_url: https://searx.github.io/searxng
     public_instances: https://searx.space
     public_instances: https://searx.space
-    wiki_url: https://github.com/searx/searx/wiki
-    twitter_url: https://twitter.com/Searx_engine
+    wiki_url: https://github.com/searxng/searxng/wiki
 
 
 search:
 search:
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict

+ 5 - 5
utils/brand.env

@@ -1,9 +1,9 @@
 export SEARX_URL=''
 export SEARX_URL=''
-export GIT_URL='https://github.com/searx/searx'
+export GIT_URL='https://github.com/searxng/searxng'
 export GIT_BRANCH='master'
 export GIT_BRANCH='master'
-export ISSUE_URL='https://github.com/searx/searx/issues'
-export DOCS_URL='https://searx.github.io/searx'
+export ISSUE_URL='https://github.com/searxng/searxng/issues'
+export DOCS_URL='https://searx.github.io/searxng'
 export PUBLIC_INSTANCES='https://searx.space'
 export PUBLIC_INSTANCES='https://searx.space'
 export CONTACT_URL=''
 export CONTACT_URL=''
-export WIKI_URL='https://github.com/searx/searx/wiki'
-export TWITTER_URL='https://twitter.com/Searx_engine'
+export WIKI_URL='https://github.com/searxng/searxng/wiki'
+export TWITTER_URL=''