Clarifying HTTPS Everywhere ruleset licensing and removing conflictual license.

Hainish · Hainish · commit cdd223b29c74 · 2017-05-26T15:15:34.000-07:00
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,10 @@
 HTTPS Everwyhere:
-Copyright © 2010-2017
+Copyright © 2010-2017 Electronic Frontier Foundation and others
 Licensed GPL v2+
 
+HTTPS Everywhere Rulesets:
+To the extent copyright applies to the rulesets, they can be used according to GPL v2 or later.
+
 Incorporating code from NoScript,
 Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
 Licensed GPL v2+
diff --git a/src/chrome/content/rules/Yandex.xml b/src/chrome/content/rules/Yandex.xml
@@ -27,22 +27,6 @@
 	intensively, and thus is being shared with community in order to prevent
 	scam and stealing from Money.Yandex.ru (and other services as well).
 
-	If you want to know about license terms, here they are:
-
-	DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-	Version 2, December 2004
-
-	Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-	Everyone is permitted to copy and distribute verbatim or modified
-	copies of this license document, and changing it is allowed as long
-	as the name is changed.
-
-	DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-	0. You just DO WHAT THE FUCK YOU WANT TO.
-
 
 	Nonfunctional subdomains:
 
