Merge branch 'master' into feature/6218-pick-directory

1 files changed, 56 insertions, 12 deletions

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index e24a9ed37..537c8947b 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -311,6 +311,20 @@ qt.workarounds.remove_service_workers:
     Note however that enabling this option *can lead to data loss* on some pages (as
     Service Worker data isn't persisted) and will negatively impact start-up time.
 
+qt.workarounds.locale:
+  type: Bool
+  default: false
+  backend: QtWebEngine
+  desc: >-
+    Work around locale parsing issues in QtWebEngine 5.15.3.
+
+    With some locales, QtWebEngine 5.15.3 is unusable without this workaround.
+    In affected scenarios, QtWebEngine will log "Network service crashed,
+    restarting service." and only display a blank page.
+
+    However, It is expected that distributions shipping QtWebEngine 5.15.3
+    follow up with a proper fix soon, so it is disabled by default.
+
 ## auto_save
 
 auto_save.interval:
@@ -607,14 +621,14 @@ content.headers.user_agent:
       # Vim-protip: Place your cursor below this comment and run
       # :r!python scripts/dev/ua_fetch.py
       - - "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like
-          Gecko) Chrome/87.0.4280.66 Safari/537.36"
-        - Chrome 87 Linux
+          Gecko) Chrome/88.0.4324.96 Safari/537.36"
+        - Chrome 88 Linux
       - - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML,
-          like Gecko) Chrome/87.0.4280.66 Safari/537.36"
-        - Chrome 87 Win10
+          like Gecko) Chrome/88.0.4324.104 Safari/537.36"
+        - Chrome 88 Win10
       - - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36
-          (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36"
-        - Chrome 87 macOS
+          (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36"
+        - Chrome 88 macOS
   supports_pattern: true
   desc: |
     User agent to send.
@@ -939,11 +953,22 @@ content.register_protocol_handler:
   desc: Allow websites to register protocol handlers via
     `navigator.registerProtocolHandler`.
 
-content.ssl_strict:
+content.tls.certificate_errors:
   default: ask
-  type: BoolAsk
+  type:
+    name: String
+    valid_values:
+      - ask: Ask how to proceed for every certificate error (unless non-overridable due
+            to HSTS).
+      - ask-block-thirdparty: Ask how to proceed for normal page loads, but silently
+            block resource loads.
+      - block: Automatically block loading on certificate errors.
+      - load-insecurely: Force loading pages despite certificate errors. This is
+            *insecure* and should be avoided. Instead of using this, consider fixing the
+            underlying issue or importing a self-signed certificate via `certutil` (or
+            Chromium) instead.
   supports_pattern: true
-  desc: Validate SSL handshakes.
+  desc: How to proceed on TLS certificate errors.
 
 content.user_stylesheets:
   type:
@@ -1617,6 +1642,18 @@ input.spatial_navigation:
     Right key, heuristics determine whether there is an element he might be
     trying to reach towards the right and which element he probably wants.
 
+input.media_keys:
+  default: true
+  type: Bool
+  backend:
+    QtWebEngine: Qt 5.14
+    QtWebKit: false
+  restart: true
+  desc: >-
+    Whether the underlying Chromium should handle media keys.
+
+    On Linux, disabling this also disables Chromium's MPRIS integration.
+
 ## keyhint
 
 keyhint.blacklist:
@@ -3236,13 +3273,20 @@ bindings.key_mappings:
     keytype: Key
     valtype: Key
   desc: >-
-    This setting can be used to map keys to other keys.
+    Map keys to other keys, so that they are equivalent in all modes.
 
     When the key used as dictionary-key is pressed, the binding for the key
     used as dictionary-value is invoked instead.
 
-    This is useful for global remappings of keys, for example to map Ctrl-[ to
-    Escape.
+    This is useful for global remappings of keys, for example to map <Ctrl-[> to
+    <Escape>.
+
+    NOTE: This should only be used if two keys should always be equivalent, i.e. for
+    things like <Enter> (keypad) and <Return> (non-keypad). For normal command bindings,
+    qutebrowser works differently to vim: You always bind keys to commands, usually via
+    `:bind` or `config.bind()`. Instead of using this setting, consider finding the
+    command a key is bound to (e.g. via `:bind gg`) and then binding the same command to
+    the desired key.
 
     Note that when a key is bound (via `bindings.default` or
     `bindings.commands`), the mapping is ignored.