Merge branch 'searxng:master' into master

.dir-locals.el

@@ -7,7 +7,7 @@
 ;;
 ;;    If you get ``*** EPC Error ***`` (even after a jedi:install-server) in
 ;;    your emacs session, mostly you have jedi-mode enabled but the python
-;;    enviroment is missed.  The python environment has to be next to the
+;;    environment is missed.  The python environment has to be next to the
 ;;    ``<repo>/.dir-locals.el`` in::
 ;;
 ;;       ./local/py3
@@ -64,10 +64,10 @@
                (setq-local python-environment-directory
                            (expand-file-name "./local" prj-root))
 
-               ;; to get in use of NVM enviroment, install https://github.com/rejeep/nvm.el
+               ;; to get in use of NVM environment, install https://github.com/rejeep/nvm.el
                (setq-local nvm-dir (expand-file-name "./.nvm" prj-root))
 
-               ;; use 'py3' enviroment as default
+               ;; use 'py3' environment as default
                (setq-local python-environment-default-root-name
                            "py3")
 

CHANGELOG.rst

@@ -323,7 +323,7 @@ Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features
  - Removed engines: faroo
 
 Special thanks to `NLNet <https://nlnet.nl>`__ for sponsoring multiple features of this release.
-Special thanks to https://www.accessibility.nl/english for making accessibilty audit.
+Special thanks to https://www.accessibility.nl/english for making accessibility audit.
 
 News
 ~~~~

dockerfiles/docker-entrypoint.sh

@@ -106,7 +106,7 @@ update_conf() {
             # There is a new version
             if [ "$FORCE_CONF_UPDATE" -ne 0 ]; then
                 # Replace the current configuration
-                printf '⚠️  Automaticaly update %s to the new version\n' "${CONF}"
+                printf '⚠️  Automatically update %s to the new version\n' "${CONF}"
                 if [ ! -f "${OLD_CONF}" ]; then
                     printf 'The previous configuration is saved to %s\n' "${OLD_CONF}"
                     mv "${CONF}" "${OLD_CONF}"

dockerfiles/uwsgi.ini

@@ -10,7 +10,7 @@ threads = 4
 # The right granted on the created socket
 chmod-socket = 666
 
-# Plugin to use and interpretor config
+# Plugin to use and interpreter config
 single-interpreter = true
 master = true
 plugin = python3

docs/admin/engines/nosql-engines.rst

@@ -25,7 +25,7 @@ place the templates at::
 
   searx/templates/{theme_name}/result_templates/{template_name}
 
-Futhermore, if you do not wish to expose these engines on a public instance, you
+Furthermore, if you do not wish to expose these engines on a public instance, you
 can still add them and limit the access by setting ``tokens`` as described in
 section :ref:`private engines`.
 

docs/admin/engines/recoll.rst

@@ -39,7 +39,7 @@ Example
 Scenario:
 
 #. Recoll indexes a local filesystem mounted in ``/export/documents/reference``,
-#. the Recoll search inteface can be reached at https://recoll.example.org/ and
+#. the Recoll search interface can be reached at https://recoll.example.org/ and
 #. the contents of this filesystem can be reached though https://download.example.org/reference
 
 .. code:: yaml

docs/admin/engines/search-indexer-engines.rst

@@ -21,7 +21,7 @@ above are added to ``settings.yml`` just commented out, as you have to
 Please note that if you are not using HTTPS to access these engines, you have to enable
 HTTP requests by setting ``enable_http`` to ``True``.
 
-Futhermore, if you do not want to expose these engines on a public instance, you
+Furthermore, if you do not want to expose these engines on a public instance, you
 can still add them and limit the access by setting ``tokens`` as described in
 section :ref:`private engines`.
 

docs/admin/engines/settings.rst

@@ -341,7 +341,7 @@ Communication with search engines.
    outgoing:
      request_timeout: 2.0       # default timeout in seconds, can be override by engine
      max_request_timeout: 10.0  # the maximum timeout in seconds
-     useragent_suffix: ""       # informations like an email address to the administrator
+     useragent_suffix: ""       # information like an email address to the administrator
      pool_connections: 100      # Maximum number of allowable connections, or null
                                 # for no limits. The default is 100.
      pool_maxsize: 10           # Number of allowable keep-alive connections, or null

docs/admin/engines/sql-engines.rst

@@ -145,7 +145,7 @@ engine, you must install the package ``mysql-connector-python``.
 
 The authentication plugin is configurable by setting ``auth_plugin`` in the
 attributes.  By default it is set to ``caching_sha2_password``.  This is an
-example configuration for quering a MySQL server:
+example configuration for querying a MySQL server:
 
 .. code:: yaml
 

docs/dev/engine_overview.rst

@@ -47,7 +47,7 @@ Engine File
    argument                type        information
    ======================= =========== ========================================================
    categories              list        pages, in which the engine is working
-   paging                  boolean     support multible pages
+   paging                  boolean     support multiple pages
    time_range_support      boolean     support search time range
    engine_type             str         - ``online`` :ref:`[ref] <demo online engine>` by
                                          default, other possibles values are:
@@ -386,11 +386,11 @@ the parameter ``template`` must be set to the desired type.
      - DOI number (like ``10.1038/d41586-018-07848-2``)
 
    * - issn
-     - :py:class:`str`
+     - :py:class:`List <list>`\ [\ :py:class:`str`\ ]
      - ISSN number like ``1476-4687``
 
    * - isbn
-     - :py:class:`str`
+     - :py:class:`List <list>`\ [\ :py:class:`str`\ ]
      - ISBN number like ``9780201896831``
 
    * - pdf_url

docs/dev/lxcdev.rst

@@ -202,7 +202,7 @@ To debug services from filtron and morty analogous use:
 
 Another point we have to notice is that the service (:ref:`SearXNG <searxng.sh>`
 runs under dedicated system user account with the same name (compare
-:ref:`create searxng user`).  To get a shell from theses accounts, simply call:
+:ref:`create searxng user`).  To get a shell from these accounts, simply call:
 
 .. tabs::
 
@@ -300,7 +300,7 @@ of the container:
 
 Now we can develop as usual in the working tree of our desktop system.  Every
 time the software was changed, you have to restart the SearXNG service (in the
-conatiner):
+container):
 
 .. tabs::
 
@@ -359,7 +359,7 @@ We build up a fully functional SearXNG suite in a archlinux container:
    $ sudo -H ./utils/lxc.sh install suite searxng-archlinux
 
 To access HTTP from the desktop we installed nginx for the services inside the
-conatiner:
+container:
 
 .. tabs::
 

docs/dev/reST.rst

@@ -15,7 +15,7 @@ generated and deployed at :docs:`github.io <.>`.  For build prerequisites read
 :ref:`docs build`.
 
 The source files of Searx's documentation are located at :origin:`docs`.  Sphinx
-assumes source files to be encoded in UTF-8 by defaul.  Run :ref:`make docs.live
+assumes source files to be encoded in UTF-8 by default.  Run :ref:`make docs.live
 <make docs.live>` to build HTML while editing.
 
 .. sidebar:: Further reading
@@ -227,13 +227,13 @@ To refer anchors use the `ref role`_ markup:
 
 .. code:: reST
 
-   Visit chapter :ref:`reST anchor`.  Or set hyperlink text manualy :ref:`foo
+   Visit chapter :ref:`reST anchor`.  Or set hyperlink text manually :ref:`foo
    bar <reST anchor>`.
 
 .. admonition:: ``:ref:`` role
    :class: rst-example
 
-   Visist chapter :ref:`reST anchor`.  Or set hyperlink text manualy :ref:`foo
+   Visist chapter :ref:`reST anchor`.  Or set hyperlink text manually :ref:`foo
    bar <reST anchor>`.
 
 .. _reST ordinary ref:
@@ -494,16 +494,16 @@ Figures & Images
    is flexible.  To get best results in the generated output format, install
    ImageMagick_ and Graphviz_.
 
-Searx's sphinx setup includes: :ref:`linuxdoc:kfigure`.  Scaleable here means;
-scaleable in sense of the build process.  Normally in absence of a converter
+Searx's sphinx setup includes: :ref:`linuxdoc:kfigure`.  Scalable here means;
+scalable in sense of the build process.  Normally in absence of a converter
 tool, the build process will break.  From the authors POV it’s annoying to care
 about the build process when handling with images, especially since he has no
 access to the build process.  With :ref:`linuxdoc:kfigure` the build process
 continues and scales output quality in dependence of installed image processors.
 
 If you want to add an image, you should use the ``kernel-figure`` (inheritance
 of :dudir:`figure`) and ``kernel-image`` (inheritance of :dudir:`image`)
-directives.  E.g. to insert a figure with a scaleable image format use SVG
+directives.  E.g. to insert a figure with a scalable image format use SVG
 (:ref:`svg image example`):
 
 .. code:: reST
@@ -1185,7 +1185,7 @@ and *targets* (e.g. a ref to :ref:`row 2 of table's body <row body 2>`).
         - cell 4.4
 
       * - row 5
-        - cell 5.1 with automatic span to rigth end
+        - cell 5.1 with automatic span to right end
 
       * - row 6
         - cell 6.1
@@ -1237,7 +1237,7 @@ and *targets* (e.g. a ref to :ref:`row 2 of table's body <row body 2>`).
         - cell 4.4
 
       * - row 5
-        - cell 5.1 with automatic span to rigth end
+        - cell 5.1 with automatic span to right end
 
       * - row 6
         - cell 6.1

docs/dev/search_api.rst

@@ -93,14 +93,14 @@ Parameters
 
   :default:
      ``Hash_plugin``, ``Search_on_category_select``,
-     ``Self_Informations``, ``Tracker_URL_remover``,
+     ``Self_Information``, ``Tracker_URL_remover``,
      ``Ahmia_blacklist``
 
   :values:
      .. enabled by default
 
      ``Hash_plugin``, ``Search_on_category_select``,
-     ``Self_Informations``, ``Tracker_URL_remover``,
+     ``Self_Information``, ``Tracker_URL_remover``,
      ``Ahmia_blacklist``,
 
      .. disabled by default

requirements.txt

@@ -1,4 +1,4 @@
-certifi==2022.9.14
+certifi==2022.9.24
 babel==2.10.3
 flask-babel==2.0.0
 flask==2.2.2