Merge pull request #515 from return42/doc-theme

 Various modification of the documentation and the theme sphinx-theme

7 files changed, 15 insertions, 15 deletions

diff --git a/utils/brand.env b/utils/brand.env
index 31afce53..7c38364d 100644
--- a/utils/brand.env
+++ b/utils/brand.env
@@ -1,5 +1,5 @@
 export SEARXNG_URL=''
 export SEARXNG_PORT='8888'
 export SEARXNG_BIND_ADDRESS='127.0.0.1'
-export GIT_URL='https://github.com/searxng/searxng'
-export GIT_BRANCH='master'
+export GIT_URL='https://github.com/return42/searxng'
+export GIT_BRANCH='doc-theme'
diff --git a/utils/lib_install.sh b/utils/lib_install.sh
index 4a251c09..e8e3297c 100755
--- a/utils/lib_install.sh
+++ b/utils/lib_install.sh
@@ -121,10 +121,10 @@ install_log_searx_instance() {
     echo -e "  SEARXNG_URL         : ${_BBlue}${SEARXNG_URL:-none}${_creset}"
 
     if in_container; then
-        # searx is listening on 127.0.0.1 and not available from outside container
+        # SearXNG is listening on 127.0.0.1 and not available from outside container
         # in containers the service is listening on 0.0.0.0 (see lxc-searx.env)
         echo -e "---- container setup"
-        echo -e "  ${_BBlack}HINT:${_creset} searx only listen on loopback device" \
+        echo -e "  ${_BBlack}HINT:${_creset} SearXNG only listen on loopback device" \
              "${_BBlack}inside${_creset} the container."
         for ip in $(global_IPs) ; do
             if [[ $ip =~ .*:.* ]]; then
diff --git a/utils/searx.sh b/utils/searx.sh
index 54bddeda..09af3819 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -151,13 +151,13 @@ usage::
 shell
   start interactive shell from user ${SERVICE_USER}
 install / remove
-  :all:        complete (de-) installation of searx service
+  :all:        complete (de-) installation of SearXNG service
   :user:       add/remove service user '$SERVICE_USER' ($SERVICE_HOME)
   :dot-config: copy ./config.sh to ${SEARX_SRC}
   :searx-src:  clone $GIT_URL
   :init-src:   copy files (SEARX_SRC_INIT_FILES) to ${SEARX_SRC}
   :pyenv:      create/remove virtualenv (python) in $SEARX_PYENV
-  :uwsgi:      install searx uWSGI application
+  :uwsgi:      install SearXNG uWSGI application
   :settings:   reinstall settings from ${SEARXNG_SETTINGS_PATH}
   :packages:   install needed packages from OS package manager
   :buildhost:  install packages from OS package manager needed by buildhosts
@@ -688,7 +688,7 @@ remove_settings() {
 }
 
 remove_searx() {
-    rst_title "Drop searx sources" section
+    rst_title "Drop SearXNG sources" section
     if ask_yn "Do you really want to drop SearXNG sources ($SEARX_SRC)?"; then
         rm -rf "$SEARX_SRC"
     else
@@ -1035,7 +1035,7 @@ rst-doc() {
             [[ $DIST_VERS =~ $DIST_ID ]] && DIST_VERS=
             uWSGI_distro_setup
 
-            echo -e "\n.. START searx uwsgi-description $DIST_NAME"
+            echo -e "\n.. START searxng uwsgi-description $DIST_NAME"
 
             case $DIST_ID-$DIST_VERS in
                 ubuntu-*|debian-*)  cat <<EOF
@@ -1088,13 +1088,13 @@ EOF
 EOF
                 ;;
             esac
-            echo -e ".. END searx uwsgi-description $DIST_NAME"
+            echo -e ".. END searxng uwsgi-description $DIST_NAME"
 
-            echo -e "\n.. START searx uwsgi-appini $DIST_NAME"
+            echo -e "\n.. START searxng uwsgi-appini $DIST_NAME"
             echo ".. code:: bash"
             echo
             eval "echo \"$(< "${TEMPLATES}/${uWSGI_APPS_AVAILABLE}/${SEARXNG_UWSGI_APP}")\"" | prefix_stdout "  "
-            echo -e "\n.. END searx uwsgi-appini $DIST_NAME"
+            echo -e "\n.. END searxng uwsgi-appini $DIST_NAME"
 
         )
     done
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
index dcb7d1a7..ceaec19c 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
@@ -17,7 +17,7 @@ env = LC_ALL=C.UTF-8
 # chdir to specified directory before apps loading
 chdir = ${SEARX_SRC}/searx
 
-# searx configuration (settings.yml)
+# SearXNG configuration (settings.yml)
 env = SEARXNG_SETTINGS_PATH=${SEARXNG_SETTINGS_PATH}
 
 # disable logging for privacy
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
index 58060007..fec55316 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
@@ -17,7 +17,7 @@ env = LC_ALL=C.UTF-8
 # chdir to specified directory before apps loading
 chdir = ${SEARX_SRC}/searx
 
-# searx configuration (settings.yml)
+# SearXNG configuration (settings.yml)
 env = SEARXNG_SETTINGS_PATH=${SEARXNG_SETTINGS_PATH}
 
 # disable logging for privacy
diff --git a/utils/templates/etc/uwsgi/apps-available/searxng.ini b/utils/templates/etc/uwsgi/apps-available/searxng.ini
index 440c2e97..db11df54 100644
--- a/utils/templates/etc/uwsgi/apps-available/searxng.ini
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini
@@ -17,7 +17,7 @@ env = LC_ALL=C.UTF-8
 # chdir to specified directory before apps loading
 chdir = ${SEARX_SRC}/searx
 
-# searx configuration (settings.yml)
+# SearXNG configuration (settings.yml)
 env = SEARXNG_SETTINGS_PATH=${SEARXNG_SETTINGS_PATH}
 
 # disable logging for privacy
diff --git a/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
index 08c98cf6..a9598b52 100644
--- a/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
@@ -17,7 +17,7 @@ env = LC_ALL=C.UTF-8
 # chdir to specified directory before apps loading
 chdir = ${SEARX_SRC}/searx
 
-# searx configuration (settings.yml)
+# SearXNG configuration (settings.yml)
 env = SEARXNG_SETTINGS_PATH=${SEARXNG_SETTINGS_PATH}
 
 # disable logging for privacy