summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-25 16:11:05 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-03-27 15:30:02 +0100
commitd2e69454ce18a8cc972eb39f0ec457eb66155fdc (patch)
tree0dbef87d5af89d8112c64519e2f0893c1d9385f1 /doc
parentb63185f18d8f8aeac531fbb8c93e86b968f2a226 (diff)
downloadqutebrowser-d2e69454ce18a8cc972eb39f0ec457eb66155fdc.tar.gz
qutebrowser-d2e69454ce18a8cc972eb39f0ec457eb66155fdc.zip
notifications: Rename/consolidate settings
Diffstat (limited to 'doc')
-rw-r--r--doc/help/settings.asciidoc44
1 files changed, 22 insertions, 22 deletions
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index c997d05fb..1b5aa6205 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -181,8 +181,8 @@
|<<content.mouse_lock,content.mouse_lock>>|Allow websites to lock your mouse pointer.
|<<content.mute,content.mute>>|Automatically mute tabs.
|<<content.netrc_file,content.netrc_file>>|Netrc-file for HTTP authentication.
-|<<content.notification_presenter,content.notification_presenter>>|What notification presenter to use for web notifications.
-|<<content.notifications,content.notifications>>|Allow websites to show notifications.
+|<<content.notifications.enabled,content.notifications.enabled>>|Allow websites to show notifications.
+|<<content.notifications.presenter,content.notifications.presenter>>|What notification presenter to use for web notifications.
|<<content.pdfjs,content.pdfjs>>|Allow pdf.js to view PDF files in the browser.
|<<content.persistent_storage,content.persistent_storage>>|Allow websites to request persistent storage quota via `navigator.webkitPersistentStorage.requestQuota`.
|<<content.plugins,content.plugins>>|Enable plugins in Web pages.
@@ -2501,8 +2501,26 @@ Type: <<types,File>>
Default: empty
-[[content.notification_presenter]]
-=== content.notification_presenter
+[[content.notifications.enabled]]
+=== content.notifications.enabled
+Allow websites to show notifications.
+
+This setting supports URL patterns.
+
+On QtWebEngine, this setting requires Qt 5.13 or newer.
+
+Type: <<types,BoolAsk>>
+
+Valid values:
+
+ * +true+
+ * +false+
+ * +ask+
+
+Default: +pass:[ask]+
+
+[[content.notifications.presenter]]
+=== content.notifications.presenter
What notification presenter to use for web notifications.
Note that with Qt 5.14, certain JavaScript features for notifications will not work with the libnotify notification presenter (the `click` and `close` events, as well as the `tag` option to replace existing notifications).
@@ -2522,24 +2540,6 @@ Valid values:
Default: +pass:[auto]+
-[[content.notifications]]
-=== content.notifications
-Allow websites to show notifications.
-
-This setting supports URL patterns.
-
-On QtWebEngine, this setting requires Qt 5.13 or newer.
-
-Type: <<types,BoolAsk>>
-
-Valid values:
-
- * +true+
- * +false+
- * +ask+
-
-Default: +pass:[ask]+
-
[[content.pdfjs]]
=== content.pdfjs
Allow pdf.js to view PDF files in the browser.