Bug 236613: change to MPL/LGPL/GPL tri-license.

docshell/shistory/public/nsISHEntry.idl

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Netscape Public License
+ * The contents of this file are subject to the Mozilla Public License Version
- * Version 1.1 (the "License"); you may not use this file except in
+ * 1.1 (the "License"); you may not use this file except in compliance with
- * compliance with the License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
+ * 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
@@ -14,7 +14,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -23,16 +23,16 @@
  *   Radha Kulkarni <radha@netscape.com>
  *
  * 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 
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 

docshell/shistory/src/Makefile.in

@@ -1,23 +1,39 @@
 #
-# The contents of this file are subject to the Netscape Public
+# ***** BEGIN LICENSE BLOCK *****
-# License Version 1.1 (the "License"); you may not use this file
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
 #
-# Software distributed under the License is distributed on an "AS
+# The contents of this file are subject to the Mozilla Public License Version
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# 1.1 (the "License"); you may not use this file except in compliance with
-# implied. See the License for the specific language governing
+# the License. You may obtain a copy of the License at
-# rights and limitations under the License.
+# 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 mozilla.org code.
 #
-# The Initial Developer of the Original Code is Netscape
+# The Initial Developer of the Original Code is
-# Communications Corporation.  Portions created by Netscape are
+# Netscape Communications Corporation.
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s):
 #
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@

docshell/shistory/src/nsSHEntry.cpp

@@ -1,24 +1,41 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Mozilla Public
+ * ***** BEGIN LICENSE BLOCK *****
- * License Version 1.1 (the "License"); you may not use this file
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- * except in compliance with the License. You may obtain a copy of
+ *
- * the License at http://www.mozilla.org/MPL/
+ * 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
- * Software distributed under the License is distributed on an "AS
+ * the License. You may obtain a copy of the License at
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * http://www.mozilla.org/MPL/
- * implied. See the License for the specific language governing
+ *
- * rights and limitations under the License.
+ * 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 Mozilla browser.
- * 
+ *
- * The Initial Developer of the Original Code is Netscape
+ * The Initial Developer of the Original Code is
- * Communications, Inc.  Portions created by Netscape are
+ * Netscape Communications, Inc.
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 1999
- * 
+ * the Initial Developer. All Rights Reserved.
+ *
  * Contributor(s):
  *   Radha Kulkarni <radha@netscape.com>
- */
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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 ***** */
 
 // Local Includes
 #include "nsSHEntry.h"