Skip to content

Commit

Permalink
[fix] typos / reported by @kianmeng in searx PR-3366
Browse files Browse the repository at this point in the history
[PR-3366] searx/searx#3366

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
  • Loading branch information
return42 authored and vincens2005 committed Nov 14, 2022
1 parent 5ae0cde commit 41e848e
Show file tree
Hide file tree
Showing 52 changed files with 99 additions and 99 deletions.
6 changes: 3 additions & 3 deletions .dir-locals.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/uwsgi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/engines/nosql-engines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/engines/recoll.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/engines/search-indexer-engines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/engines/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/engines/sql-engines.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/engine_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions docs/dev/lxcdev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down Expand Up @@ -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::

Expand Down Expand Up @@ -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::

Expand Down
16 changes: 8 additions & 8 deletions docs/dev/reST.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/search_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions searx/engines/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,12 @@ def is_engine_active(engine: Engine):

def register_engine(engine: Engine):
if engine.name in engines:
logger.error('Engine config error: ambigious name: {0}'.format(engine.name))
logger.error('Engine config error: ambiguous name: {0}'.format(engine.name))
sys.exit(1)
engines[engine.name] = engine

if engine.shortcut in engine_shortcuts:
logger.error('Engine config error: ambigious shortcut: {0}'.format(engine.shortcut))
logger.error('Engine config error: ambiguous shortcut: {0}'.format(engine.shortcut))
sys.exit(1)
engine_shortcuts[engine.shortcut] = engine.name

Expand Down
2 changes: 1 addition & 1 deletion searx/engines/duckduckgo_definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def response(resp):
# * book / performing art / film / television / media franchise / concert tour / playwright
# * prepared food
# * website / software / os / programming language / file format / software engineer
# * compagny
# * company

content = ''
heading = search_res.get('Heading', '')
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def response(resp):

search_res = loads(resp.text)

# check if items are recieved
# check if items are received
if 'items' not in search_res:
return []

Expand Down
6 changes: 3 additions & 3 deletions searx/engines/google.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,22 +326,22 @@ def response(resp):

# google *sections*
if extract_text(eval_xpath(result, g_section_with_header)):
logger.debug("ingoring <g-section-with-header>")
logger.debug("ignoring <g-section-with-header>")
continue

try:
title_tag = eval_xpath_getindex(result, title_xpath, 0, default=None)
if title_tag is None:
# this not one of the common google results *section*
logger.debug('ingoring item from the result_xpath list: missing title')
logger.debug('ignoring item from the result_xpath list: missing title')
continue
title = extract_text(title_tag)
url = eval_xpath_getindex(result, href_xpath, 0, None)
if url is None:
continue
content = extract_text(eval_xpath_getindex(result, content_xpath, 0, default=None), allow_none=True)
if content is None:
logger.debug('ingoring item from the result_xpath list: missing content of title "%s"', title)
logger.debug('ignoring item from the result_xpath list: missing content of title "%s"', title)
continue

logger.debug('add link to results: %s', title)
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/google_news.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def response(resp):
padding = (4 - (len(jslog) % 4)) * "="
jslog = b64decode(jslog + padding)
except binascii.Error:
# URL cant be read, skip this result
# URL can't be read, skip this result
continue

# now we have : b'[null, ... null,"https://www.cnn.com/.../index.html"]'
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/google_videos.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def response(resp):

# ignore google *sections*
if extract_text(eval_xpath(result, g_section_with_header)):
logger.debug("ingoring <g-section-with-header>")
logger.debug("ignoring <g-section-with-header>")
continue

# ingnore articles without an image id / e.g. news articles
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/photon.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def response(resp):
elif properties.get('osm_type') == 'R':
osm_type = 'relation'
else:
# continue if invalide osm-type
# continue if invalid osm-type
continue

url = result_base_url.format(osm_type=osm_type, osm_id=properties.get('osm_id'))
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/startpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def _fetch_supported_languages(resp):
# native name, the English name of the writing script used by the language,
# or occasionally something else entirely.

# this cases are so special they need to be hardcoded, a couple of them are mispellings
# this cases are so special they need to be hardcoded, a couple of them are misspellings
language_names = {
'english_uk': 'en-GB',
'fantizhengwen': ['zh-TW', 'zh-HK'],
Expand Down
4 changes: 2 additions & 2 deletions searx/engines/wikidata.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# SERVICE wikibase:label: https://en.wikibooks.org/wiki/SPARQL/SERVICE_-_Label#Manual_Label_SERVICE
# https://en.wikibooks.org/wiki/SPARQL/WIKIDATA_Precision,_Units_and_Coordinates
# https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Data_model
# optmization:
# optimization:
# * https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/query_optimization
# * https://github.com/blazegraph/database/wiki/QueryHints
QUERY_TEMPLATE = """
Expand Down Expand Up @@ -386,7 +386,7 @@ def add_date(name):
add_amount('P2046') # area
add_amount('P281') # postal code
add_label('P38') # currency
add_amount('P2048') # heigth (building)
add_amount('P2048') # height (building)

# Media
for p in [
Expand Down
2 changes: 1 addition & 1 deletion searx/engines/wolframalpha_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def request(query, params):
# replace private user area characters to make text legible
def replace_pua_chars(text):
pua_chars = {
'\uf522': '\u2192', # rigth arrow
'\uf522': '\u2192', # right arrow
'\uf7b1': '\u2115', # set of natural numbers
'\uf7b4': '\u211a', # set of rational numbers
'\uf7b5': '\u211d', # set of real numbers
Expand Down
4 changes: 2 additions & 2 deletions searx/engines/xpath.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
0: none, 1: moderate, 2:strict
If not supported, the URL paramter is an empty string.
If not supported, the URL parameter is an empty string.
"""

Expand Down Expand Up @@ -114,7 +114,7 @@

time_range_url = '&hours={time_range_val}'
'''Time range URL parameter in the in :py:obj:`search_url`. If no time range is
requested by the user, the URL paramter is an empty string. The
requested by the user, the URL parameter is an empty string. The
``{time_range_val}`` replacement is taken from the :py:obj:`time_range_map`.
.. code:: yaml
Expand Down
2 changes: 1 addition & 1 deletion searx/external_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_external_url(url_id, item_id, alternative="default"):
"""Return an external URL or None if url_id is not found.
url_id can take value from data/external_urls.json
The "imdb_id" value is automaticaly converted according to the item_id value.
The "imdb_id" value is automatically converted according to the item_id value.
If item_id is None, the raw URL with the $1 is returned.
"""
Expand Down
2 changes: 1 addition & 1 deletion searx/plugins/self_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from flask_babel import gettext
import re

name = gettext('Self Informations')
name = gettext('Self Information')
description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')
default_on = True
preference_section = 'query'
Expand Down

0 comments on commit 41e848e

Please sign in to comment.