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

Merge branch 'ml--master'

Browse Source
This commit is contained in:
Florian Bruhin 2015-01-04 13:37:35 +01:00
commit 37e31d92c7
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

@ -136,6 +136,7 @@ Contributors, sorted by the number of commits in descending order:
* Mathias Fussenegger * Mathias Fussenegger
* Larry Hynes * Larry Hynes
* Peter Vilim * Peter Vilim
* Matthias Lisin
* Helen Sherwood-Taylor * Helen Sherwood-Taylor
* HalosGhost * HalosGhost
// QUTE_AUTHORS_END // QUTE_AUTHORS_END

2
doc/help/settings.asciidoc
View File

@ -1026,7 +1026,7 @@ The file can be in one of the following formats:
- One host per line - One host per line
- A zip-file of any of the above, with either only one file, or a file named 'hosts' (with any extension). - A zip-file of any of the above, with either only one file, or a file named 'hosts' (with any extension).
Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext,]+ Default: +pass:[http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext]+
== hints == hints
Hinting settings. Hinting settings.

2
qutebrowser/config/configdata.py
View File

@ -517,7 +517,7 @@ DATA = collections.OrderedDict([
'http://winhelp2002.mvps.org/hosts.zip,' 'http://winhelp2002.mvps.org/hosts.zip,'
'http://malwaredomains.lehigh.edu/files/justdomains.zip,' 'http://malwaredomains.lehigh.edu/files/justdomains.zip,'
'http://pgl.yoyo.org/adservers/serverlist.php?' 'http://pgl.yoyo.org/adservers/serverlist.php?'
'hostformat=hosts&mimetype=plaintext,'), 'hostformat=hosts&mimetype=plaintext'),
"List of URLs of lists which contain hosts to block.\n\n" "List of URLs of lists which contain hosts to block.\n\n"
"The file can be in one of the following formats:\n\n" "The file can be in one of the following formats:\n\n"
"- An '/etc/hosts'-like file\n" "- An '/etc/hosts'-like file\n"