From 281445658682f01d5725876a2052d686939aee8e Mon Sep 17 00:00:00 2001 From: Matthias Lisin Date: Sun, 4 Jan 2015 02:02:26 +0100 Subject: [PATCH 1/2] Commas are awesome Fixes #438 Fixes #439 --- qutebrowser/config/configdata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index c7669f4ff..17d812dab 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -517,7 +517,7 @@ DATA = collections.OrderedDict([ 'http://winhelp2002.mvps.org/hosts.zip,' 'http://malwaredomains.lehigh.edu/files/justdomains.zip,' '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" "The file can be in one of the following formats:\n\n" "- An '/etc/hosts'-like file\n" From abe2dd7589c21188aa13b17b34afaf43c4be4963 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 4 Jan 2015 13:37:09 +0100 Subject: [PATCH 2/2] Regenerate docs --- README.asciidoc | 1 + doc/help/settings.asciidoc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 626d8ead9..66787a9fe 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -136,6 +136,7 @@ Contributors, sorted by the number of commits in descending order: * Mathias Fussenegger * Larry Hynes * Peter Vilim +* Matthias Lisin * Helen Sherwood-Taylor * HalosGhost // QUTE_AUTHORS_END diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 3c963a9b0..8422d9b61 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -1026,7 +1026,7 @@ The file can be in one of the following formats: - 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). -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 Hinting settings.