summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2018-09-28 17:36:15 +0200
committerFlorian Bruhin <me@the-compiler.org>2018-09-28 17:36:35 +0200
commit2b1ebe2762071e1e8421f8f9fa2f1072d145f64d (patch)
treed46f0759c1eca1c841fdf73bf082f4c540d21009
parent282fbaf447849ea0e8d2bdbf3c4375689e1dcbb6 (diff)
downloadqutebrowser-2b1ebe2762071e1e8421f8f9fa2f1072d145f64d.tar.gz
qutebrowser-2b1ebe2762071e1e8421f8f9fa2f1072d145f64d.zip
Improve content.mute docs
-rw-r--r--doc/help/settings.asciidoc1
-rw-r--r--qutebrowser/config/configdata.yml7
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 7c49e5364..721a6685b 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1920,6 +1920,7 @@ On QtWebKit, this setting is unavailable.
[[content.mute]]
=== content.mute
Automatically mute tabs.
+Note that if the :tab-mute command is used, the mute status for the affected tab is now controlled manually, and this setting doesn't have any effect.
This setting supports URL patterns.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 8f06814ca..5bd198a75 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -810,7 +810,12 @@ content.mute:
default: false
type: Bool
supports_pattern: true
- desc: Automatically mute tabs.
+ desc: >-
+ Automatically mute tabs.
+
+ Note that if the `:tab-mute` command is used, the mute status for the
+ affected tab is now controlled manually, and this setting doesn't have any
+ effect.
# emacs: '