From 94117bc6b2b09d2724526a8865187be6535b8034 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 18 Sep 2018 20:28:48 +0200 Subject: [PATCH] Update docs --- doc/changelog.asciidoc | 2 ++ doc/help/settings.asciidoc | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 1d266082d..6eb427a94 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -63,6 +63,8 @@ Changed - Regenerating completion history now shows a progress dialog. - Make qute:// pages work properly on Qt 5.11.2 - The `content.autoplay` setting now supports URL patterns on Qt >= 5.11. +- The `content.host_blocking.whitelist` setting now takes a list of URL + patterns instead of globs. Fixed ~~~~~ diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 608429ab5..dc418a99a 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -129,7 +129,7 @@ |<>|User agent to send. Unset to send the default. |<>|Enable host blocking. |<>|List of URLs of lists which contain hosts to block. -|<>|List of domains that should always be loaded, despite being ad-blocked. +|<>|A list of patterns that should always be loaded, despite being ad-blocked. |<>|Enable hyperlink auditing (``). |<>|Load images automatically in web pages. |<>|Show javascript alerts. @@ -1729,11 +1729,10 @@ Default: [[content.host_blocking.whitelist]] === content.host_blocking.whitelist -List of domains that should always be loaded, despite being ad-blocked. -Domains may contain * and ? wildcards and are otherwise required to exactly match the requested domain. +A list of patterns that should always be loaded, despite being ad-blocked. Local domains are always exempt from hostblocking. -Type: <> +Type: <> Default: