diff options
| author | Florian Bruhin <me@the-compiler.org> | 2018-09-30 22:08:00 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2018-09-30 22:08:00 +0200 |
| commit | 45a3611b627dfdfa471900cacb166930786bc8b6 (patch) | |
| tree | 200b6d445a0ca79c38ed9e550988a1ce2e74cbb0 | |
| parent | 6f01571462fd31a5ffc593f825819a0c5579f91b (diff) | |
| download | qutebrowser-45a3611b627dfdfa471900cacb166930786bc8b6.tar.gz qutebrowser-45a3611b627dfdfa471900cacb166930786bc8b6.zip | |
Update docs
| -rw-r--r-- | doc/changelog.asciidoc | 2 | ||||
| -rw-r--r-- | doc/help/settings.asciidoc | 5 | ||||
| -rw-r--r-- | qutebrowser/config/configdata.yml | 5 |
3 files changed, 12 insertions, 0 deletions
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: <<types,List of Url>> 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 |