summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-01 21:07:49 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-03-01 21:07:49 +0100
commit0d00d81dee805a78fd939e1318f56a0f5c8cbdbd (patch)
treeb702c62efc053dab46a8f0b204901aa438df6c49
parentb986f1fdccf971d71a70b0ee85d6ef92d80441d4 (diff)
parentf7313af2b5dd05fb84e1b2d85937d250c16c5e63 (diff)
downloadqutebrowser-0d00d81dee805a78fd939e1318f56a0f5c8cbdbd.tar.gz
qutebrowser-0d00d81dee805a78fd939e1318f56a0f5c8cbdbd.zip
Merge remote-tracking branch 'origin/pr/6092'
-rw-r--r--doc/faq.asciidoc7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 7257345a5..156596128 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -97,9 +97,10 @@ security bugs, please contact me directly at mail@qutebrowser.org, GPG ID
https://www.the-compiler.org/pubkey.asc[0x916eb0c8fd55a072].
Is there an ad blocker?::
- There is a simple host-based ad blocker that takes `/etc/hosts`-like lists.
-+
-More advanced ad blockers can have a big impact on browsing speed and https://blog.mozilla.org/nnethercote/2014/05/14/adblock-pluss-effect-on-firefoxs-memory-usage/[RAM usage], so implementing support for AdBlock Plus-like lists is not a priority.
+ With version 2.0.0, if the Python adblock library is available, it will be used
+ to integrate Brave's Rust adblocker library for improved adblocking
+ based on ABP-like filter lists (such as EasyList). Otherwise, the default ad blocker
+ is a simple host-based ad blocker that takes `/etc/hosts`-like lists.
How can I get No-Script-like behavior?::
To disable JavaScript by default: