Bug 1369500 - Adjust about:license note about GPLv3. r=gerv. DONTBUILD
authorFelipe Gomes <felipc@gmail.com>
Thu, 15 Jun 2017 15:03:45 -0300
changeset 364221 c9a931f0238d59e19969bd6fd7ea5d1cd2058045
parent 364220 4e3a5199d4fed80eab8dfd8d06ebe07513dd0587
child 364222 7a16c7f2ed08b5c70817ae265c2b8f0ad0c8cff8
push id44834
push userkwierso@gmail.com
push dateThu, 15 Jun 2017 23:28:29 +0000
treeherderautoland@d9824cf47dc8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs1369500
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1369500 - Adjust about:license note about GPLv3. r=gerv. DONTBUILD MozReview-Commit-ID: GcyU6sEb9zU
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1365,20 +1365,21 @@ Library.</p>
 
 
     <hr>
 
 
     <h1 id="gpl-3.0">GNU General Public License 3.0</h1>
 
     <p>This license does not apply to any of the code shipped with
-    Firefox, but may apply to Disconnect.me blocklists downloaded
-    after installation for use with the tracking protection feature.
-    Firefox and such blocklists are separate and independent works as
-    described in Sections 5 and 6 of this license.</p>
+    Firefox, but may apply to blocklists downloaded after installation
+    for use with the tracking protection feature. Firefox and such
+    blocklists are separate and independent works as described in
+    Sections 5 and 6 of this license. Our blocklist is based on one
+    originally written by Disconnect.me.</p>
 
 <pre>Version 3, 29 June 2007
 
 Copyright &copy; 2007 Free Software Foundation, Inc.
 &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.</pre>