Bug 541761 - correct legal text to make it clear Firefox logo files are free in copyright terms, although the image is still a trademark. r=handerson.
authorGervase Markham <gerv@gerv.net>
Mon, 08 Mar 2010 16:31:22 +0000
changeset 39109 99d80bc3f18b
parent 39108 b68bc22b6a3d
child 39110 d2773f8f2c46
push id12015
push usergerv@mozilla.org
push date2010-03-08 16:32 +0000
treeherdermozilla-central@99d80bc3f18b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershanderson
bugs541761
milestone1.9.3a3pre
Bug 541761 - correct legal text to make it clear Firefox logo files are free in copyright terms, although the image is still a trademark. r=handerson.
other-licenses/branding/firefox/LICENSE
--- a/other-licenses/branding/firefox/LICENSE
+++ b/other-licenses/branding/firefox/LICENSE
@@ -1,6 +1,42 @@
-You are not granted rights or licenses to the trademarks of the
+These files are under the tri-license, as below. However, please note that you 
+are not granted any trademark rights or licenses to the trademarks of the
 Mozilla Foundation or any party, including without limitation the
 Firefox name or logo.
 
 For more information, see: http://www.mozilla.org/foundation/licensing.html 
 
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version 
+1.1 (the "License"); you may not use this file except in compliance with 
+the License. You may obtain a copy of the License at 
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the Firefox logos.
+
+The Initial Developer of the Original Code is
+the Mozilla Foundation.
+Portions created by the Initial Developer are Copyright (C) 2009
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK ****