summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2018-02-03 19:08:42 +0100
committerFlorian Bruhin <git@the-compiler.org>2018-02-04 21:30:59 +0100
commitc8de4675db14fad73389ad8805bf0fc571a469f0 (patch)
tree9df14cb7558634d46ebe30ab59c9f7967a36f6dc
parent79935e048c2a56402cdc43afb48fd4f94fb2dd46 (diff)
downloadqutebrowser-c8de4675db14fad73389ad8805bf0fc571a469f0.tar.gz
qutebrowser-c8de4675db14fad73389ad8805bf0fc571a469f0.zip
Various spelling fixes
-rw-r--r--doc/changelog.asciidoc4
-rw-r--r--doc/contributing.asciidoc2
-rw-r--r--doc/help/configuring.asciidoc2
-rw-r--r--doc/help/settings.asciidoc2
-rw-r--r--doc/stacktrace.asciidoc2
-rw-r--r--qutebrowser/browser/greasemonkey.py2
-rw-r--r--qutebrowser/commands/command.py4
-rw-r--r--qutebrowser/config/configdata.yml2
-rw-r--r--qutebrowser/misc/backendproblem.py2
-rw-r--r--qutebrowser/misc/savemanager.py4
-rw-r--r--qutebrowser/utils/version.py6
-rw-r--r--scripts/dev/misc_checks.py2
-rw-r--r--tests/end2end/features/conftest.py4
-rw-r--r--tests/end2end/features/hints.feature2
-rw-r--r--tests/end2end/features/utilcmds.feature2
-rw-r--r--tests/end2end/fixtures/testprocess.py2
-rw-r--r--tests/unit/mainwindow/test_messageview.py2
17 files changed, 23 insertions, 23 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index edc5523ba..8e943d2c7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -1143,7 +1143,7 @@ Added
- New `:fake-key` command to send a fake keypress to a website or to
qutebrowser.
- New `--mhtml` argument for `:download` to download a page including all
- ressources as MHTML file.
+ resources as MHTML file.
- New option `tabs -> title-alignment` to change the alignment of tab titles.
Changed
@@ -1343,7 +1343,7 @@ Added
- New argument `--no-err-windows` to suppress all error windows.
- New arguments `--top-navigate` and `--bottom-navigate` (`-t`/`-b`) for `:scroll-page` to specify a navigation action (e.g. automatically go to the next page when arriving at the bottom).
- New flag `-d`/`--detach` for `:spawn` to detach the spawned process so it's not closed when qutebrowser is.
-- New flag `-v`/`--verbose` for `:spawn` to print informations when the process started/exited successfully.
+- New flag `-v`/`--verbose` for `:spawn` to print information when the process started/exited successfully.
- Many new color settings (foreground setting for every background setting).
- New setting `ui -> modal-js-dialog` to use the standard modal dialogs for javascript questions instead of using the statusbar.
- New setting `colors -> webpage.bg` to set the background color to use for websites which don't set one.
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index afbb752c5..a75034b95 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -375,7 +375,7 @@ The following logging levels are available for every logger:
|error |There was an issue and some kind of operation was abandoned.
|warning |There was an issue but the operation can continue running.
|info |General informational messages.
-|debug |Verbose debugging informations.
+|debug |Verbose debugging information.
|=======================================================================
[[commands]]
diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index b801e8820..bb43e1dfe 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -254,7 +254,7 @@ Getting the config directory
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you need to get the qutebrowser config directory, you can do so by reading
-`config.configdir`. Similarily, you can get the qutebrowser data directory via
+`config.configdir`. Similarly, you can get the qutebrowser data directory via
`config.datadir`.
This gives you a https://docs.python.org/3/library/pathlib.html[`pathlib.Path`
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 67ede4fa8..c44dfb9a6 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1580,7 +1580,7 @@ Default: +pass:[true]+
[[content.headers.referer]]
=== content.headers.referer
When to send the Referer header.
-The Referer header tells websites from which website you were coming from when visting them.
+The Referer header tells websites from which website you were coming from when visiting them.
Type: <<types,String>>
diff --git a/doc/stacktrace.asciidoc b/doc/stacktrace.asciidoc
index 5505eca93..00c89e884 100644
--- a/doc/stacktrace.asciidoc
+++ b/doc/stacktrace.asciidoc
@@ -37,7 +37,7 @@ is available in the repositories:
Archlinux
^^^^^^^^^
-For Archlinux, no debug informations are provided. You can either compile Qt
+For Archlinux, no debug information is provided. You can either compile Qt
yourself (which will take a few hours even on a modern machine) or use
debugging symbols compiled/packaged by me (x86_64 only).
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 7ee843b0b..ba2879848 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -134,7 +134,7 @@ class GreasemonkeyManager(QObject):
Signals:
scripts_reloaded: Emitted when scripts are reloaded from disk.
Any cached or already-injected scripts should be
- considered obselete.
+ considered obsolete.
"""
scripts_reloaded = pyqtSignal()
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index b4ff1cde8..dd9a63101 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -193,10 +193,10 @@ class Command:
return False
def _inspect_func(self):
- """Inspect the function to get useful informations from it.
+ """Inspect the function to get useful information from it.
Sets instance attributes (desc, type_conv, name_conv) based on the
- informations.
+ information.
Return:
How many user-visible arguments the command has.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2d99af729..e2daefe3b 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -360,7 +360,7 @@ content.headers.referer:
When to send the Referer header.
The Referer header tells websites from which website you were coming from
- when visting them.
+ when visiting them.
content.headers.user_agent:
default: null
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index 8cc5b71b2..cf1024c57 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -191,7 +191,7 @@ def _handle_nouveau_graphics():
text="<p>There are two ways to fix this:</p>"
"<p><b>Forcing software rendering</b></p>"
"<p>This allows you to use the newer QtWebEngine backend (based "
- "on Chromium) but could have noticable performance impact "
+ "on Chromium) but could have noticeable performance impact "
"(depending on your hardware). "
"This sets the <i>qt.force_software_rendering = True</i> option "
"(if you have a <i>config.py</i> file, you'll need to set this "
diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py
index 02001902c..436e3b66f 100644
--- a/qutebrowser/misc/savemanager.py
+++ b/qutebrowser/misc/savemanager.py
@@ -77,7 +77,7 @@ class Saveable:
Args:
is_exit: Whether we're currently exiting qutebrowser.
explicit: Whether the user explicitly requested this save.
- silent: Don't write informations to log.
+ silent: Don't write information to log.
force: Force saving, no matter what.
"""
if (self._config_opt is not None and
@@ -157,7 +157,7 @@ class SaveManager(QObject):
Args:
is_exit: Whether we're currently exiting qutebrowser.
explicit: Whether this save operation was triggered explicitly.
- silent: Don't write informations to log. Used to reduce log spam
+ silent: Don't write information to log. Used to reduce log spam
when autosaving.
force: Force saving, no matter what.
"""
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 47cbf6eff..624197bdd 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
-"""Utilities to show various version informations."""
+"""Utilities to show various version information."""
import re
import sys
@@ -167,7 +167,7 @@ def _git_str_subprocess(gitpath):
def _release_info():
- """Try to gather distribution release informations.
+ """Try to gather distribution release information.
Return:
list of (filename, content) tuples.
@@ -335,7 +335,7 @@ def _uptime() -> datetime.timedelta:
def version():
- """Return a string with various version informations."""
+ """Return a string with various version information."""
lines = ["qutebrowser v{}".format(qutebrowser.__version__)]
gitver = _git_str()
if gitver is not None:
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index c04a35f1a..ff372a7ae 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -89,7 +89,7 @@ def check_spelling():
'[Ww]ether', '[Pp]rogramatically', '[Ss]plitted', '[Ee]xitted',
'[Mm]ininum', '[Rr]esett?ed', '[Rr]ecieved', '[Rr]egularily',
'[Uu]nderlaying', '[Ii]nexistant', '[Ee]lipsis', 'commiting',
- 'existant', '[Rr]esetted'}
+ 'existant', '[Rr]esetted', '[Ss]imilarily', '[Ii]nformations'}
# Words which look better when splitted, but might need some fine tuning.
words |= {'[Ww]ebelements', '[Mm]ouseevent', '[Kk]eysequence',
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 5b97ba2a4..228e80f06 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -63,7 +63,7 @@ def pytest_runtest_makereport(item, call):
if (not hasattr(report.longrepr, 'addsection') or
not hasattr(report, 'scenario')):
# In some conditions (on macOS and Windows it seems), report.longrepr
- # is actually a tuple. This is handled similarily in pytest-qt too.
+ # is actually a tuple. This is handled similarly in pytest-qt too.
#
# Since this hook is invoked for any test, we also need to skip it for
# non-BDD ones.
@@ -389,7 +389,7 @@ def clear_ssl_errors(request, quteproc):
def path_should_be_loaded(quteproc, path):
"""Make sure the given path was loaded according to the log.
- This is usally the better check compared to "should be requested" as the
+ This is usually the better check compared to "should be requested" as the
page could be loaded from local cache.
"""
quteproc.wait_for_load_finished(path)
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0151a14ad..3c55c74b1 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -211,7 +211,7 @@ Feature: Using hints
And I hint with args "links normal" and follow a
Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
- ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
+ ### FIXME currently skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
@xfail_norun
Scenario: Using :follow-hint inside a scrolled iframe
When I open data/hints/iframe_scroll.html
diff --git a/tests/end2end/features/utilcmds.feature b/tests/end2end/features/utilcmds.feature
index bff13d40e..5ccbac9b3 100644
--- a/tests/end2end/features/utilcmds.feature
+++ b/tests/end2end/features/utilcmds.feature
@@ -117,7 +117,7 @@ Feature: Miscellaneous utility commands exposed to the user.
And the message "test2" should be shown
And the message "test2" should be shown
- Scenario: :repeat-command with not-normal command inbetween
+ Scenario: :repeat-command with not-normal command in between
When I run :message-info test3
And I run :prompt-accept
And I run :repeat-command
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 3fb259e47..99ea81337 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -101,7 +101,7 @@ def pytest_runtest_makereport(item, call):
if not hasattr(report.longrepr, 'addsection'):
# In some conditions (on macOS and Windows it seems), report.longrepr
- # is actually a tuple. This is handled similarily in pytest-qt too.
+ # is actually a tuple. This is handled similarly in pytest-qt too.
return
if item.config.getoption('--capture') == 'no':
diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py
index 3a502b2bd..6c9d767c5 100644
--- a/tests/unit/mainwindow/test_messageview.py
+++ b/tests/unit/mainwindow/test_messageview.py
@@ -117,7 +117,7 @@ def test_replaced_messages(view, replace1, replace2, length):
(Qt.BackButton, 2),
])
def test_click_messages(qtbot, view, button, count):
- """Messages should dissappear when we click on them."""
+ """Messages should disappear when we click on them."""
view.show_message(usertypes.MessageLevel.info, 'test mouse click')
view.show_message(usertypes.MessageLevel.info, 'test mouse click 2')
qtbot.mousePress(view, button)