diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index be2900bc6..564cf9b15 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -20,7 +20,7 @@ v0.3.0 Added ~~~~~ -- New commands `:message-info`, `:message-error` and `:message-warning` to show messages in the statusbar, e.g. from an userscript. +- New commands `:message-info`, `:message-error` and `:message-warning` to show messages in the statusbar, e.g. from a userscript. - New command `:scroll-px` which replaces `:scroll` for pixel-exact scrolling. - New command `:jseval` to run a javascript snippet on the current page. - New (hidden) command `:follow-selected` (bound to `Enter`/`Ctrl-Enter` by default) to follow the link which is currently selected (e.g. after searching via `/`). diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc index 7fccc2117..a822fbb10 100644 --- a/doc/help/commands.asciidoc +++ b/doc/help/commands.asciidoc @@ -211,7 +211,7 @@ Start hinting. - `fill`: Fill the commandline with the command given as argument. - `download`: Download the link. - - `userscript`: Call an userscript with `$QUTE_URL` set to the + - `userscript`: Call a userscript with `$QUTE_URL` set to the link. - `spawn`: Spawn a command. @@ -539,7 +539,7 @@ Note the {url} variable which gets replaced by the current URL might be useful h * +'cmdline'+: The commandline to execute. ==== optional arguments -* +*-u*+, +*--userscript*+: Run the command as an userscript. +* +*-u*+, +*--userscript*+: Run the command as a userscript. * +*-v*+, +*--verbose*+: Show notifications when the command started/exited. * +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser. diff --git a/doc/userscripts.asciidoc b/doc/userscripts.asciidoc index 5ca2adb42..97c820898 100644 --- a/doc/userscripts.asciidoc +++ b/doc/userscripts.asciidoc @@ -18,7 +18,7 @@ qutebrowser to run them. Getting information ------------------- -The following environment variables will be set when an userscript is launched: +The following environment variables will be set when a userscript is launched: - `QUTE_MODE`: Either `hints` (started via hints) or `command` (started via command or key binding). diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index e29350d1b..a264bfbca 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -942,7 +942,7 @@ class CommandDispatcher: useful here. Args: - userscript: Run the command as an userscript. + userscript: Run the command as a userscript. verbose: Show notifications when the command started/exited. detach: Whether the command should be detached from qutebrowser. cmdline: The commandline to execute. @@ -976,7 +976,7 @@ class CommandDispatcher: @cmdutils.register(instance='command-dispatcher', scope='window', deprecated='Use :spawn --userscript instead!') def run_userscript(self, cmd, *args: {'nargs': '*'}, verbose=False): - """Run an userscript given as argument. + """Run a userscript given as argument. Args: cmd: The userscript to run. diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index 4f03a5774..7e6e0575e 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -519,7 +519,7 @@ class HintManager(QObject): download_manager.get(url, elem.webFrame().page()) def _call_userscript(self, elem, context): - """Call an userscript from a hint. + """Call a userscript from a hint. Args: elem: The QWebElement to use in the userscript. @@ -731,7 +731,7 @@ class HintManager(QObject): - `fill`: Fill the commandline with the command given as argument. - `download`: Download the link. - - `userscript`: Call an userscript with `$QUTE_URL` set to the + - `userscript`: Call a userscript with `$QUTE_URL` set to the link. - `spawn`: Spawn a command. diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index 136b23e57..658dfff98 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -"""Functions to execute an userscript.""" +"""Functions to execute a userscript.""" import os import os.path @@ -323,7 +323,7 @@ def store_source(frame): def run(cmd, *args, win_id, env, verbose=False): - """Convenience method to run an userscript. + """Convenience method to run a userscript. Args: cmd: The userscript binary to run. diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py index 945f3636f..2d4165bbf 100644 --- a/qutebrowser/completion/completer.py +++ b/qutebrowser/completion/completer.py @@ -133,7 +133,7 @@ class Completer(QObject): """Get a completion model based on an enum member. Args: - completion: An usertypes.Completion member. + completion: A usertypes.Completion member. parts: The parts currently in the commandline. cursor_part: The part the cursor is in. diff --git a/qutebrowser/mainwindow/statusbar/prompter.py b/qutebrowser/mainwindow/statusbar/prompter.py index 7728cbf46..53831e37c 100644 --- a/qutebrowser/mainwindow/statusbar/prompter.py +++ b/qutebrowser/mainwindow/statusbar/prompter.py @@ -230,7 +230,7 @@ class Prompter(QObject): prompt = objreg.get('prompt', scope='window', window=self._win_id) if (self._question.mode == usertypes.PromptMode.user_pwd and self._question.user is None): - # User just entered an username + # User just entered a username self._question.user = prompt.lineedit.text() prompt.txt.setText("Password:") prompt.lineedit.clear() diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 5d1c40465..d4209b0a3 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -141,7 +141,7 @@ def _is_url_dns(urlstr): def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True): - """Get a QUrl based on an user input which is URL or search term. + """Get a QUrl based on a user input which is URL or search term. Args: urlstr: URL to load as a string. @@ -273,7 +273,7 @@ def is_url(urlstr): def qurl_from_user_input(urlstr): - """Get a QUrl based on an user input. Additionally handles IPv6 addresses. + """Get a QUrl based on a user input. Additionally handles IPv6 addresses. QUrl.fromUserInput handles something like '::1' as a file URL instead of an IPv6, so we first try to handle it as a valid IPv6, and if that fails we diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py index 13a2e1cfb..5a9ca4ad1 100644 --- a/qutebrowser/utils/usertypes.py +++ b/qutebrowser/utils/usertypes.py @@ -257,7 +257,7 @@ class Question(QObject): mode: A PromptMode enum member. yesno: A question which can be answered with yes/no. text: A question which requires a free text answer. - user_pwd: A question for an username and password. + user_pwd: A question for a username and password. default: The default value. For yesno, None (no default), True or False. For text, a default text as string. diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py index c9cb6f2a3..2f1cdb2ca 100644 --- a/scripts/dev/misc_checks.py +++ b/scripts/dev/misc_checks.py @@ -82,7 +82,7 @@ def check_spelling(): '[Oo]ccur[^r .]', '[Ss]eperator', '[Ee]xplicitely', '[Rr]esetted', '[Aa]uxillary', '[Aa]ccidentaly', '[Aa]mbigious', '[Ll]oosly', '[Ii]nitialis', '[Cc]onvienence', '[Ss]imiliar', '[Uu]ncommited', - '[Rr]eproducable'} + '[Rr]eproducable', '[Aa]n [Uu]ser'} # Words which look better when splitted, but might need some fine tuning. words |= {'[Ww]ebelements', '[Mm]ouseevent', '[Kk]eysequence',