summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/changelog.asciidoc7
-rw-r--r--doc/help/settings.asciidoc1
-rw-r--r--qutebrowser/config/configdata.yml6
3 files changed, 13 insertions, 1 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 008c693a3..f7965a952 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -19,6 +19,13 @@ breaking changes (such as renamed commands) can happen in minor releases.
v2.4.0 (unreleased)
-------------------
+Added
+~~~~~
+
+- New `content.blocking.hosts.block_subdomains` setting which can be used to
+ disable the subdomain blocking for the hosts-based adblocker introduced in
+ v2.3.0.
+
Fixed
~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 57bcdd8e0..d993ddddd 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1998,6 +1998,7 @@ Default: +pass:[true]+
[[content.blocking.hosts.block_subdomains]]
=== content.blocking.hosts.block_subdomains
Block subdomains of blocked hosts.
+Note: If only a single subdomain is blocked but should be allowed, consider using `content.blocking.whitelist` instead.
Type: <<types,Bool>>
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2f090cc06..5f5a71b06 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -750,7 +750,11 @@ content.blocking.hosts.lists:
content.blocking.hosts.block_subdomains:
default: true
type: Bool
- desc: Block subdomains of blocked hosts.
+ desc: >-
+ Block subdomains of blocked hosts.
+
+ Note: If only a single subdomain is blocked but should be allowed, consider
+ using `content.blocking.whitelist` instead.
content.blocking.method:
default: auto