rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update docs

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-18 20:28:48 +02:00
parent 93ec3e3fad
commit 94117bc6b2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/changelog.asciidoc
View File

@ -63,6 +63,8 @@ Changed
- Regenerating completion history now shows a progress dialog. - Regenerating completion history now shows a progress dialog.
- Make qute:// pages work properly on Qt 5.11.2 - Make qute:// pages work properly on Qt 5.11.2
- The `content.autoplay` setting now supports URL patterns on Qt >= 5.11. - 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 Fixed
~~~~~ ~~~~~

7
doc/help/settings.asciidoc
View File

@ -129,7 +129,7 @@
|<<content.headers.user_agent,content.headers.user_agent>>|User agent to send. Unset to send the default. |<<content.headers.user_agent,content.headers.user_agent>>|User agent to send. Unset to send the default.
|<<content.host_blocking.enabled,content.host_blocking.enabled>>|Enable host blocking. |<<content.host_blocking.enabled,content.host_blocking.enabled>>|Enable host blocking.
|<<content.host_blocking.lists,content.host_blocking.lists>>|List of URLs of lists which contain hosts to block. |<<content.host_blocking.lists,content.host_blocking.lists>>|List of URLs of lists which contain hosts to block.
|<<content.host_blocking.whitelist,content.host_blocking.whitelist>>|List of domains that should always be loaded, despite being ad-blocked. |<<content.host_blocking.whitelist,content.host_blocking.whitelist>>|A list of patterns that should always be loaded, despite being ad-blocked.
|<<content.hyperlink_auditing,content.hyperlink_auditing>>|Enable hyperlink auditing (`<a ping>`). |<<content.hyperlink_auditing,content.hyperlink_auditing>>|Enable hyperlink auditing (`<a ping>`).
|<<content.images,content.images>>|Load images automatically in web pages. |<<content.images,content.images>>|Load images automatically in web pages.
|<<content.javascript.alert,content.javascript.alert>>|Show javascript alerts. |<<content.javascript.alert,content.javascript.alert>>|Show javascript alerts.
@ -1729,11 +1729,10 @@ Default:
[[content.host_blocking.whitelist]] [[content.host_blocking.whitelist]]
=== content.host_blocking.whitelist === content.host_blocking.whitelist
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.
Domains may contain * and ? wildcards and are otherwise required to exactly match the requested domain.
Local domains are always exempt from hostblocking. Local domains are always exempt from hostblocking.
Type: <<types,List of String>> Type: <<types,List of UrlPattern>>
Default: Default: