From 45a3611b627dfdfa471900cacb166930786bc8b6 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 30 Sep 2018 22:08:00 +0200 Subject: Update docs --- doc/changelog.asciidoc | 2 ++ doc/help/settings.asciidoc | 5 +++++ qutebrowser/config/configdata.yml | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 1e554452b..037da5ee5 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -83,6 +83,8 @@ Changed boolean: `always`, `never`, and `when-searching` (which only displays it while a search is active). - '@@' now repeats the last run macro. +- The `content.host_blocking.lists` setting now accepts a `file://` URL to a + directory, and reads all files in that directory. Fixed ~~~~~ diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 962e9ebae..60257de62 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -1729,6 +1729,11 @@ The file can be in one of the following formats: - A zip-file of any of the above, with either only one file, or a file named `hosts` (with any extension). +It's also possible to add a local file or directory via a `file://` URL. In +case of a directory, all files in the directory are read as adblock lists. + +The file `~/.config/qutebrowser/blocked-hosts` is always read if it exists. + Type: <> diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml index ae9351899..34b2d4923 100644 --- a/qutebrowser/config/configdata.yml +++ b/qutebrowser/config/configdata.yml @@ -547,6 +547,11 @@ content.host_blocking.lists: - A zip-file of any of the above, with either only one file, or a file named `hosts` (with any extension). + It's also possible to add a local file or directory via a `file://` URL. In + case of a directory, all files in the directory are read as adblock lists. + + The file `~/.config/qutebrowser/blocked-hosts` is always read if it exists. + content.host_blocking.whitelist: default: - piwik.org -- cgit v1.2.3-54-g00ecf