Follow the American way(tm) of spelling things

CHANGELOG.asciidoc

@@ -53,7 +53,7 @@ Changed
   colored logs without it.
 - URLs are now shown decoded when hovering.
 - Keybindings are now shown in the command completion
-- Improved behaviour when pasting multiple lines
+- Improved behavior when pasting multiple lines
 
 Fixed
 -----

misc/userscripts/password_fill

@@ -22,7 +22,7 @@ Pass backend: (see also passwordstore.org)
   must be contained in a later line beginning with "user:", "login:", or
   "username:" (configurable by the user_pattern variable).
 
-Behaviour:
+Behavior:
   It will try to find a username/password entry in the configured backend
   (currently only pass) for the current website and will load that pair of
   username and password to any form on the current page that has some password
@@ -89,7 +89,7 @@ simplify_url() {
 
 # no_entries_found() is called if the first query_entries() call did not find
 # any matching entries. Multiple implementations are possible:
-# The easiest behaviour is to quit:
+# The easiest behavior is to quit:
 #no_entries_found() {
 #    if [ 0 -eq "${#files[@]}" ] ; then
 #        die "No entry found for »$simple_url«"
@@ -106,7 +106,7 @@ simplify_url() {
 #     fi
 # }
 
-# Another behaviour is to drop another level of subdomains until search hits
+# Another behavior is to drop another level of subdomains until search hits
 # are found:
 no_entries_found() {
     while [ 0 -eq "${#files[@]}" ] && [ -n "$simple_url" ]; do

misc/userscripts/view_in_mpv

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Behaviour:
+# Behavior:
 #   Userscript for qutebrowser which views the current web page in mpv using
 #   sensible mpv-flags. While viewing the page in MPV, all <video>, <embed>,
 #   and <object> tags in the original page are temporarily removed. Clicking on

scripts/dev/misc_checks.py

@@ -49,7 +49,7 @@ def _get_files(only_py=False):
         if only_py:
             endings = {'.py'}
         else:
-            endings = {'.py', '.asciidoc', '.js'}
+            endings = {'.py', '.asciidoc', '.js', '.feature'}
         files = (e for e in filenames if os.path.splitext(e)[1] in endings)
         for name in files:
             yield os.path.join(dirpath, name)

tests/integration/features/search.feature

@@ -41,7 +41,7 @@ Feature: Searching on a page
         And I run :yank-selected
         Then the clipboard should contain "/slash"
 
-    # This doesn't work because this is QtWebKit behaviour.
+    # This doesn't work because this is QtWebKit behavior.
     @xfail_norun
     Scenario: Searching text with umlauts
         When I run :search blub

tests/integration/features/tabs.feature

@@ -119,7 +119,7 @@ Feature: Tab management
         And I run :tab-close --opposite
         Then the error "-o is not supported with 'tabs->select-on-remove' set to 'previous'!" should be shown
 
-    Scenario: :tab-close should restore selection behaviour
+    Scenario: :tab-close should restore selection behavior
         When I set tabs -> select-on-remove to right
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab

tests/integration/features/userscripts.feature

@@ -1,3 +1,3 @@
-Scenario: Starting an userscript which doesn't exist
+Scenario: Starting a userscript which doesn't exist
     When I run :spawn -u this_does_not_exist
     Then the error "Error while spawning userscript: The process failed to start." should be shown