Merge branch 'master' of https://github.com/shaggytwodope/qutebrowser

CHANGELOG.asciidoc

@@ -481,7 +481,7 @@ Removed
 Fixed
 ~~~~~
 
-* Fix rare exception when a key is pressed shorly after opening a window
+* Fix rare exception when a key is pressed shortly after opening a window
 * Fix exception with certain invalid URLs like `http:foo:0`
 * Work around Qt bug which renders checkboxes on OS X unusable
 * Fix exception when a local files can't be read in `:adblock-update`

CONTRIBUTING.asciidoc

@@ -227,7 +227,7 @@ Hints
 Python and Qt objects
 ~~~~~~~~~~~~~~~~~~~~~
 
-For many tasks, there are solutions in both Qt and the Python standard libary
+For many tasks, there are solutions in both Qt and the Python standard library
 available.
 
 In qutebrowser, the policy is usually using the Python libraries, as they
@@ -565,7 +565,7 @@ qutebrowser release
 
 * Create annotated git tag (`git tag -s "v0.X.Y" -m "Release v0.X.Y"`)
 * If it's a new minor, create git branch `v0.X.x`
-* If commiting on minor branch, cherry-pick release commit to master.
+* If committing on minor branch, cherry-pick release commit to master.
 * `git push origin`; `git push origin v0.X.Y`
 * Create release on github
 * Mark the milestone at https://github.com/The-Compiler/qutebrowser/milestones

FAQ.asciidoc

@@ -115,7 +115,7 @@ Experiencing segfaults (crashes) on Debian systems.::
 
 Segfaults on Facebook, Medium, Amazon, ...::
     If you are on a Debian or Ubuntu based system, you might experience some crashes
-    visting these sites. This is caused by various bugs in Qt which have been
+    visiting these sites. This is caused by various bugs in Qt which have been
     fixed in Qt 5.4. However Debian and Ubuntu are slow to adopt or upgrade
     some packages. On Debian Jessie, it's recommended to use the experimental
     repos as described in https://github.com/The-Compiler/qutebrowser/blob/master/INSTALL.asciidoc#on-debian--ubuntu[INSTALL].

tests/unit/misc/test_sessions.py

@@ -78,7 +78,7 @@ def test_did_not_load(sess_man):
 class TestExists:
 
     @pytest.mark.parametrize('absolute', [True, False])
-    def test_existant(self, tmpdir, absolute):
+    def test_existent(self, tmpdir, absolute):
         session_dir = tmpdir / 'sessions'
         abs_session = tmpdir / 'foo.yml'
         rel_session = session_dir / 'foo.yml'

tests/unit/utils/test_qtutils.py

@@ -478,7 +478,7 @@ class TestSavefileOpen:
         assert tmpdir.listdir() == [filename]
 
     def test_failing_commit(self, tmpdir):
-        """Test with the file being closed before comitting."""
+        """Test with the file being closed before committing."""
         filename = tmpdir / 'foo'
         with pytest.raises(OSError) as excinfo:
             with qtutils.savefile_open(str(filename), binary=True) as f:
@@ -695,7 +695,7 @@ class TestPyQIODevice:
         assert len(pyqiodev) == len(data)
 
     def test_failing_open(self, tmpdir):
-        """Test open() which fails (because it's an existant directory)."""
+        """Test open() which fails (because it's an existent directory)."""
         qf = QFile(str(tmpdir))
         dev = qtutils.PyQIODevice(qf)
         with pytest.raises(qtutils.QtOSError) as excinfo:

tests/unit/utils/test_standarddir.py

@@ -232,8 +232,8 @@ class TestInitCacheDirTag:
         mocker.patch('builtins.open', side_effect=AssertionError)
         standarddir._init_cachedir_tag()
 
-    def test_existant_cache_dir_tag(self, tmpdir, mocker, monkeypatch):
-        """Test with an existant CACHEDIR.TAG."""
+    def test_existent_cache_dir_tag(self, tmpdir, mocker, monkeypatch):
+        """Test with an existent CACHEDIR.TAG."""
         monkeypatch.setattr('qutebrowser.utils.standarddir.cache',
                             lambda: str(tmpdir))
         mocker.patch('builtins.open', side_effect=AssertionError)