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

toolkit/components/alerts/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 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@

toolkit/components/alerts/public/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 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@

toolkit/components/alerts/public/nsIAlertsService.idl

@@ -1,11 +1,11 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,25 +14,25 @@
  *
  * 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) 2002
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *          Scott MacGregor <mscott@netscape.com>
+ *   Scott MacGregor <mscott@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 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 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 ***** */
 

toolkit/components/alerts/resources/content/alert.js

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,25 +13,25 @@
  *
  * 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.
  *
  * Contributor(s):
- *  Scott MacGregor <mscott@netscape.com>
+ *   Scott MacGregor <mscott@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 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 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 ***** */
 

toolkit/components/alerts/resources/content/alert.xul

@@ -1,23 +1,40 @@
 <?xml version="1.0"?>
-<!--
+<!-- ***** BEGIN LICENSE BLOCK *****
-The contents of this file are subject to the Netscape Public
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-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 contents of this file are subject to the Mozilla Public License Version
-the License at http://www.mozilla.org/NPL/
+   - 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
-Software distributed under the License is distributed on an "AS
+   - http://www.mozilla.org/MPL/
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   -
-implied. See the License for the specific language governing
+   - Software distributed under the License is distributed on an "AS IS" basis,
-rights and limitations under the License.
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-
+   - for the specific language governing rights and limitations under the
-The Original Code is Mozilla Communicator client code, released
+   - License.
-March 31, 1998.
+   -
-
+   - The Original Code is Mozilla Communicator client code, released
-The Initial Developer of the Original Code is Netscape
+   - March 31, 1998.
-Communications Corporation. Portions created by Netscape are
+   -
- Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - The Initial Developer of the Original Code is
-Rights Reserved.
+   - Netscape Communications Corporation.
--->
+   - Portions created by the Initial Developer are Copyright (C) 1998-1999
+   - 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 ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/alerts/alert.css" type="text/css"?>
 

toolkit/components/alerts/src/Makefile.in

@@ -1,24 +1,40 @@
 #! gmake
 # 
-# 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
-# The Original Code is mozilla.org code
+# for the specific language governing rights and limitations under the
-# 
+# License.
-# The Initial Developer of the Original Code is Netscape
+#
-# Communications Corporation.  Portions created by Netscape are 
+# The Original Code is mozilla.org code.
-# Copyright (C) 2000 Netscape Communications Corporation.  All
+#
-# Rights Reserved.
+# The Initial Developer of the Original Code is
-# 
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# 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 *****
 
 DEPTH   = ../../../..
 topsrcdir = @top_srcdir@

toolkit/components/alerts/src/nsAlertsService.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
 /* ***** 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) 2002
  * the Initial Developer. All Rights Reserved.
@@ -23,16 +23,16 @@
  *   Scott MacGregor <mscott@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 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 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 ***** */
 

toolkit/components/alerts/src/nsAlertsService.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,25 +14,25 @@
  *
  * 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) 2002
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *     Scott MacGregor <mscott@netscape.com>
+ *   Scott MacGregor <mscott@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 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 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 ***** */
 

toolkit/components/autocomplete/public/Makefile.in

@@ -1,22 +1,40 @@
 #
-# 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/
 #
-# The Initial Developer of the Original Code is Netscape
+# Software distributed under the License is distributed on an "AS IS" basis,
-# Communications Corporation.  Portions created by Netscape are
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# for the specific language governing rights and limitations under the
-# Rights Reserved.
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# 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.
 #
 # Contributor(s):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@

toolkit/components/autocomplete/public/nsIAutoCompleteController.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -28,11 +28,11 @@
  * 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 ***** */
 

toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/autocomplete/public/nsIAutoCompletePopup.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/autocomplete/public/nsIAutoCompleteResult.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/autocomplete/public/nsIAutoCompleteResultTypes.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Communicator client 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.
@@ -22,16 +22,16 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/autocomplete/public/nsIAutoCompleteSearch.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/autocomplete/src/Makefile.in

@@ -1,22 +1,40 @@
 #
-# 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/
 #
-# The Initial Developer of the Original Code is Netscape
+# Software distributed under the License is distributed on an "AS IS" basis,
-# Communications Corporation.  Portions created by Netscape are
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# for the specific language governing rights and limitations under the
-# Rights Reserved.
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# 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.
 #
 # Contributor(s):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@

toolkit/components/autocomplete/src/nsAutoCompleteController.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* ***** BEGIN LICENSE BLOCK *****
+/* ***** 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 Communicator client 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.
@@ -25,16 +25,16 @@
  *   Johnny Stenback <jst@mozilla.jstenback.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 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 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 ***** */
 

toolkit/components/autocomplete/src/nsAutoCompleteController.h

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Communicator client 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.
@@ -22,16 +22,16 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.cpp

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Communicator client 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.
@@ -22,16 +22,16 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.h

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Communicator client 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.
@@ -22,16 +22,16 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/build/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 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@

toolkit/components/build/nsModule.cpp

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/build/nsToolkitCompsCID.h

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/console/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 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     = ../../..

toolkit/components/console/content/console.js

@@ -1,11 +1,11 @@
 # -*- Mode: Java; 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,25 +14,25 @@
 #
 # 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.
 #
 # Contributor(s):
-#          Joe Hewitt <hewitt@netscape.com>
+#   Joe Hewitt <hewitt@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 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 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 *****
 

toolkit/components/console/content/console.xul

@@ -1,24 +1,42 @@
 <?xml version="1.0"?> <!-- -*- tab-width: 4; indent-tabs-mode: nil -*- -->
 
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# 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-1999 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-# 
+#
-# Contributor(s): Joe Hewitt <hewitt@netscape.com>
+# Contributor(s):
+#   Joe Hewitt <hewitt@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
+# 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 *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/console/console.css" type="text/css"?> 

toolkit/components/console/jsconsole-clhandler.js

@@ -1,23 +1,40 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * 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 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) 1999 Netscape Communications Corporation.  All
+ * Portions created by the Initial Developer are Copyright (C) 1999
- * Rights Reserved.
+ * the Initial Developer. All Rights Reserved.
- * 
+ *
- * Contributor(s): Martijn Pieters <mj@digicool.com>
+ * Contributor(s):
- */
+ *   Martijn Pieters <mj@digicool.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
+ * 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 ***** */
 
 /*
  * -jsconsole commandline handler; starts up the JavaScript console.

toolkit/components/downloads/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 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@

toolkit/components/downloads/public/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 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@

toolkit/components/downloads/public/nsIDownloadManager.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,26 +14,26 @@
  *
  * 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.
  *
  * Contributor(s):
- *   Blake Ross <blaker@netscape.com> 
+ *   Blake Ross <blaker@netscape.com>
  *   Ben Goodger <ben@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 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 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 ***** */
 

toolkit/components/downloads/public/nsIDownloadProgressListener.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,25 +14,25 @@
  *
  * 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.
  *
  * Contributor(s):
- *   Blake Ross <blaker@netscape.com> 
+ *   Blake Ross <blaker@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 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 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 ***** */
 

toolkit/components/downloads/public/nsIXPInstallManagerUI.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 @@
  *   Ben Goodger <ben@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 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 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 ***** */
 

toolkit/components/downloads/src/Makefile.in

@@ -1,25 +1,41 @@
 #! gmake
 # 
-# 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/
-# 
-# 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
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
 #
+# 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Stuart Parmenter <pavlov@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
+# 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@

toolkit/components/downloads/src/nsDownloadManager.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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
@@ -29,11 +29,11 @@
  * 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 ***** */
  

toolkit/components/downloads/src/nsDownloadManager.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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.
@@ -24,16 +24,16 @@
  *   Ben Goodger <ben@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 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 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 ***** */
  

toolkit/components/downloads/src/nsDownloadProxy.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 @@
  *   Blake Ross <blaker@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
  

toolkit/components/filepicker/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 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     = ../../..

toolkit/components/filepicker/content/filepicker.js

@@ -1,29 +1,46 @@
 # -*- Mode: Java; tab-width: 2; 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/
 #
-# 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 Communications
+# The Initial Developer of the Original Code is
-# Corporation.  Portions created by Netscape are
+# Netscape Communications Corporation.
-# Copyright (C) 2000 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 2000
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s):
-#  Stuart Parmenter <pavlov@netscape.com>
+#   Stuart Parmenter <pavlov@netscape.com>
-#  Brian Ryner <bryner@brianryner.com>
+#   Brian Ryner <bryner@brianryner.com>
-#  Jan Varga <varga@nixcorp.com>
+#   Jan Varga <varga@nixcorp.com>
-#  Peter Annema <disttsc@bart.nl>
+#   Peter Annema <disttsc@bart.nl>
-#  Johann Petrak <johann@ai.univie.ac.at>
+#   Johann Petrak <johann@ai.univie.ac.at>
-#  Akkana Peck <akkana@netscape.com>
+#   Akkana Peck <akkana@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
+# 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 *****
 
 const nsIFilePicker       = Components.interfaces.nsIFilePicker;
 const nsIDirectoryServiceProvider = Components.interfaces.nsIDirectoryServiceProvider;

toolkit/components/filepicker/content/filepicker.xul

@@ -1,27 +1,44 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
-#  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
-#  The Original Code is mozilla.org code.
+# for the specific language governing rights and limitations under the
-#  
+# License.
-#  The Initial Developer of the Original Code is Netscape
+#
-#  Communications Corporation. Portions created by Netscape are
+# The Original Code is mozilla.org code.
-#  Copyright (C) 2000 Netscape Communications Corporation.
+#
-#  All Rights Reserved.
+# The Initial Developer of the Original Code is
-#  
+# Netscape Communications Corporation.
-#  Contributor(s): 
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
 #   Stuart Parmenter <pavlov@netscape.com>
 #   Brian Ryner <bryner@brianryner.com>
 #   Jan Varga <varga@nixcorp.com>
 #   Peter Annema <disttsc@bart.nl>
 #   Johann Petrak <johann@ai.univie.ac.at>
+#
+# 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 *****
 
 <?xml-stylesheet href="chrome://global/skin/filepicker.css" type="text/css"?>
 

toolkit/components/help/content/contextHelp.js

@@ -1,3 +1,4 @@
+# ***** 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
@@ -18,8 +19,8 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#      brantgurganus2001@cherokeescouting.org
+#   brantgurganus2001@cherokeescouting.org
-#      Jswalden86@netzero.net
+#   Jswalden86@netzero.net
 #
 # 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
@@ -33,6 +34,7 @@
 # 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 *****
 
 #ifndef MOZ_THUNDERBIRD
 const MOZILLA_CONTENT_PACK = "chrome://help/locale/firebirdhelp.rdf";

toolkit/components/help/content/customizeToolbar.xul

@@ -1,25 +1,42 @@
 <?xml version="1.0"?> 
 #
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# 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-1999 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-# 
+#
-# Contributor(s): 
+# Contributor(s):
 #   R.J. Keller <rlk@trfenv.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
+# 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 *****
 
 <!DOCTYPE dialog [
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">

toolkit/components/help/content/helpContextOverlay.xul

@@ -1,4 +1,5 @@
 <?xml version="1.0"?> 
+# ***** 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
@@ -11,7 +12,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is Mozilla Help code
+# The Original Code is Mozilla Help code.
 #
 # The Initial Developer of the Original Code is
 # R.J. Keller.
@@ -28,9 +29,11 @@
 # 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 LGPL or the GPL. If you do not delete
+# 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 *****
 
 <!DOCTYPE overlay [
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">

toolkit/components/help/content/helpMenuOverlay.xul

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 #
+# ***** 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
@@ -20,8 +21,8 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#    brantgurganus2001@cherokeescouting.org
+#   brantgurganus2001@cherokeescouting.org
-#    Jswalden86@netzero.net
+#   Jswalden86@netzero.net
 #
 # 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
@@ -31,9 +32,11 @@
 # 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 LGPL or the GPL. If you do not delete
+# 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 *****
 
 <!DOCTYPE overlay [
     <!ENTITY % helpMenuDTD SYSTEM "chrome://help/locale/helpMenuOverlay.dtd">

toolkit/components/help/content/toolbarCustomization.js

@@ -14,7 +14,7 @@
 # The Original Code is Firebird Help code.
 #
 # The Initial Developer of the Original Code is
-# R.J. Keller
+# R.J. Keller.
 # Portions created by the Initial Developer are Copyright (C) 2003
 # the Initial Developer. All Rights Reserved.
 #
@@ -32,8 +32,8 @@
 # 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 *****
-#
+
 # CustomizeToolbar() - Enables the Customize Toolbar dialog and sets toolbar
 #	and toolbar button properties approprately.
 #

toolkit/components/history/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 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@

toolkit/components/history/public/Makefile.in

@@ -1,24 +1,40 @@
 #
-# 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):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@

toolkit/components/history/public/nsIBrowserHistory.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.
@@ -22,16 +22,16 @@
  * 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 
+ * 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 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 ***** */
 

toolkit/components/history/src/Makefile.in

@@ -1,24 +1,40 @@
 #
-# 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):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@

toolkit/components/history/src/nsGlobalHistory.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -28,16 +28,16 @@
  *   Michael Lowe <michael.lowe@bigfoot.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 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 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 ***** */
 

toolkit/components/history/src/nsGlobalHistory.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -25,16 +25,16 @@
  *   Joe Hewitt <hewitt@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 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 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 ***** */
 

toolkit/components/history/src/nsHistoryLoadListener.h

@@ -1,27 +1,40 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
- * 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 Communicator client code.
  *
- * The Initial Developer of the Original Code is Netscape Communications
+ * The Initial Developer of the Original Code is
- * 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.
- *
- * Original Author(s):
- *   Alec Flett <alecf@netscape.com>
  *
  * 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 ***** */
 
 
 #include "nsIWebProgressListener.h"

toolkit/components/history/src/nsMdbPtr.h

@@ -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 Communicator client 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.
@@ -22,16 +22,16 @@
  * 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 
+ * 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 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 ***** */
 

toolkit/components/passwordmgr/base/nsIPassword.idl

@@ -1,23 +1,40 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
- * 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 mozilla.org code.
- 
+ *
- * 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) 2001, Mozilla.  All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 2001
- 
+ * 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 ***** */
 
 #include "nsISupports.idl"
 

toolkit/components/passwordmgr/resources/content/passwordManager.js

@@ -1,26 +1,43 @@
 # -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 #
-# 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/
 #
-# The Original Code is Mozilla Communicator client code, released March
+# Software distributed under the License is distributed on an "AS IS" basis,
-# 31, 1998.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# The Initial Developer of the Original Code is Netscape Communications
+# The Original Code is Mozilla Communicator client code, released
-# Corporation. Portions created by Netscape are
+# March 31, 1998.
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
 #
-# Contributor(s): 
+# 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.
+#
+# Contributor(s):
 #   Ben "Count XULula" Goodger
 #   Brian Ryner <bryner@brianryner.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
+# 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 *****
 
 /*** =================== INITIALISATION CODE =================== ***/
 

toolkit/components/passwordmgr/resources/content/passwordManager.xul

@@ -1,25 +1,42 @@
 <?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil -*- -->
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# 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-1999 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
 #   Ben Goodger
 #   Brian Ryner <bryner@brianryner.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
+# 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 *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 

toolkit/components/printing/content/printPageSetup.js

@@ -1,11 +1,11 @@
 /* -*- Mode: Java; 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,27 +14,27 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
- * Contributor(s): 
+ * Contributor(s):
  *   Masaki Katakai <katakai@japan.sun.com>
  *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
  *   Asko Tontti <atontti@cc.hut.fi>
  *
  * 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 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 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 ***** */
 

toolkit/components/printing/content/printPageSetup.xul

@@ -1,33 +1,47 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
 
-<!--
+<!-- ***** BEGIN LICENSE BLOCK *****
-The contents of this file are subject to the Netscape Public
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-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/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/
 
-The Original Code is Mozilla Communicator client code, released
+ Software distributed under the License is distributed on an "AS IS" basis,
-March 31, 1998.
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
 
-The Initial Developer of the Original Code is Netscape
+ The Original Code is Mozilla Communicator client code, released
-Communications Corporation. Portions created by Netscape are
+ March 31, 1998.
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
 
-Contributor(s): 
+ The Initial Developer of the Original Code is
-  Masaki Katakai <katakai@japan.sun.com>
+ Netscape Communications Corporation.
-  Dan Rosen <dr@netscape.com>
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
-  Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
+ the Initial Developer. All Rights Reserved.
-  Asko Tontti <atontti@cc.hut.fi>
-  Rod Spears <rods@netscape.com>
-  Bill Law <law@netscape.com>
 
--->
+ Contributor(s):
+   Masaki Katakai <katakai@japan.sun.com>
+   Dan Rosen <dr@netscape.com>
+   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
+   Asko Tontti <atontti@cc.hut.fi>
+   Rod Spears <rods@netscape.com>
+   Bill Law <law@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
+ 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 ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/printPageSetup.css" type="text/css"?>

toolkit/components/printing/content/printUtils.js

@@ -1,11 +1,11 @@
 # -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 # ***** 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.
@@ -26,18 +26,18 @@
 #   Pierre Chanial <p_ch@verizon.net>
 #
 # 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 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 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 ***** */
+# ***** END LICENSE BLOCK *****
 
 var  XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 

toolkit/components/satchel/public/Makefile.in

@@ -1,22 +1,40 @@
 #
-# 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/
 #
-# The Initial Developer of the Original Code is Netscape
+# Software distributed under the License is distributed on an "AS IS" basis,
-# Communications Corporation.  Portions created by Netscape are
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# for the specific language governing rights and limitations under the
-# Rights Reserved.
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# 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.
 #
 # Contributor(s):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@

toolkit/components/satchel/public/nsIFormFillController.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/satchel/public/nsIFormHistory.idl

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,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) 2001
  * the Initial Developer. All Rights Reserved.
@@ -27,11 +27,11 @@
  * 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 ***** */
 

toolkit/components/satchel/src/Makefile.in

@@ -1,22 +1,40 @@
 #
-# 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/
 #
-# The Initial Developer of the Original Code is Netscape
+# Software distributed under the License is distributed on an "AS IS" basis,
-# Communications Corporation.  Portions created by Netscape are
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# Copyright (C) 1998 Netscape Communications Corporation. All
+# for the specific language governing rights and limitations under the
-# Rights Reserved.
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# 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.
 #
 # Contributor(s):
 #   Joe Hewitt <hewitt@netscape.com> (Original Author)
 #
+# 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 *****
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@

toolkit/components/satchel/src/nsFormFillController.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -24,16 +24,16 @@
  *   Dean Tessman <dean_tessman@hotmail.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 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 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 ***** */
 

toolkit/components/satchel/src/nsFormFillController.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -24,16 +24,16 @@
  *   Dean Tessman <dean_tessman@hotmail.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 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 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 ***** */
 

toolkit/components/satchel/src/nsFormHistory.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/satchel/src/nsFormHistory.h

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,7 +13,7 @@
  *
  * The Original Code is Mozilla Communicator client 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.
@@ -22,16 +22,16 @@
  *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/components/startup/public/nsIUserInfo.idl

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,25 +14,25 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
  * Contributor(s):
- * Seth Spitzer <sspitzer@netscape.com>
+ *   Seth Spitzer <sspitzer@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 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 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 ***** */
 

toolkit/components/startup/src/nsUserInfo.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,25 +14,25 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
  * Contributor(s):
- * Seth Spitzer <sspitzer@netscape.com>
+ *   Seth Spitzer <sspitzer@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 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 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 ***** */
 #ifndef __nsUserInfo_h

toolkit/components/startup/src/nsUserInfoMac.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -22,16 +22,16 @@
  * 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 
+ * 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 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 ***** */
 

toolkit/components/startup/src/nsUserInfoMac.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,25 +14,25 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
  * Contributor(s):
- * Seth Spitzer <sspitzer@netscape.com>
+ *   Seth Spitzer <sspitzer@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 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 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 ***** */
 #ifndef __nsUserInfoMac_h

toolkit/components/startup/src/nsUserInfoOS2.cpp

@@ -1,23 +1,40 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * 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 Communicator client code.
  *
- * The Initial Developer of the Original Code is Netscape Communications
+ * The Initial Developer of the Original Code is
- * 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):
+ *
+ * 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 *****
  * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
  * described herein are Copyright (c) International Business Machines Corporation, 2000.
  * Modifications to Mozilla code or documentation identified per MPL Section 3.3

toolkit/components/startup/src/nsUserInfoUnix.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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 @@
  *   Seth Spitzer <sspitzer@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 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 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 ***** */
 

toolkit/components/startup/src/nsUserInfoWin.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 Communicator client 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.
@@ -24,16 +24,16 @@
  *   Seth Spitzer <sspitzer@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 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 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 ***** */
 

toolkit/components/typeaheadfind/Makefile.in

@@ -1,28 +1,38 @@
-# The contents of this file are subject to the Mozilla Public License
+# ***** BEGIN LICENSE BLOCK *****
-# Version 1.1 (the "License"); you may not use this file except in
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# compliance with the License. You may obtain a copy of the License at
+#
+# 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"
+# Software distributed under the License is distributed on an "AS IS" basis,
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# License for the specific language governing rights and limitations
+# for the specific language governing rights and limitations under the
-# under the License.
+# License.
-
+#
-# The Initial Developer of the Original Code is Aaron Leventhal.
+# The Original Code is mozilla.org Code.
-# Portions created by Aaron Leventhal are Copyright (C) 2001
+#
-# Aaron Leventhal. All Rights Reserved.
+# The Initial Developer of the Original Code is
-
+# Aaron Leventhal.
-# Alternatively, the contents of this file may be used under the terms
+# Portions created by the Initial Developer are Copyright (C) 2001
-# of the GNU General Public License (the "GPL"), in which case the
+# the Initial Developer. All Rights Reserved.
-# provisions of the GPL are applicable instead of those above.  If you
+#
-# wish to allow use of your version of this file only under the terms of
-# the GPL and not to allow others to use your version of this file under
-# the MPL, indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by the
-# GPL. If you do not delete the provisions above, a recipient may use
-# your version of this file under either the MPL or the GPL.
-
 # 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 *****
 
 DEPTH = ../../..
 topsrcdir = @top_srcdir@

toolkit/components/typeaheadfind/public/Makefile.in

@@ -1,28 +1,38 @@
-# The contents of this file are subject to the Mozilla Public License
+# ***** BEGIN LICENSE BLOCK *****
-# Version 1.1 (the "License"); you may not use this file except in
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# compliance with the License. You may obtain a copy of the License at
+#
+# 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"
+# Software distributed under the License is distributed on an "AS IS" basis,
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# License for the specific language governing rights and limitations
+# for the specific language governing rights and limitations under the
-# under the License.
+# License.
-
+#
-# The Initial Developer of the Original Code is Aaron Leventhal.
+# The Original Code is mozilla.org Code.
-# Portions created by Aaron Leventhal are Copyright (C) 2001
+#
-# Aaron Leventhal. All Rights Reserved.
+# The Initial Developer of the Original Code is
-
+# Aaron Leventhal.
-# Alternatively, the contents of this file may be used under the terms
+# Portions created by the Initial Developer are Copyright (C) 2001
-# of the GNU General Public License (the "GPL"), in which case the
+# the Initial Developer. All Rights Reserved.
-# provisions of the GPL are applicable instead of those above.  If you
+#
-# wish to allow use of your version of this file only under the terms of
-# the GPL and not to allow others to use your version of this file under
-# the MPL, indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by the
-# GPL. If you do not delete the provisions above, a recipient may use
-# your version of this file under either the MPL or the GPL.
-
 # 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 *****
 
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@

toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,15 +14,13 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Blake Ross.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- * Original Author:  Blake Ross      (blake@cs.stanford.edu)
+ *   Original Author:  Blake Ross      (blake@cs.stanford.edu)
- * Contributors:    
- *
  *
  * 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
@@ -30,11 +28,11 @@
  * 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 ***** */
 

toolkit/components/typeaheadfind/src/Makefile.in

@@ -1,28 +1,38 @@
-# The contents of this file are subject to the Mozilla Public License
+# ***** BEGIN LICENSE BLOCK *****
-# Version 1.1 (the "License"); you may not use this file except in
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# compliance with the License. You may obtain a copy of the License at
+#
+# 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"
+# Software distributed under the License is distributed on an "AS IS" basis,
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# License for the specific language governing rights and limitations
+# for the specific language governing rights and limitations under the
-# under the License.
+# License.
-
+#
-# The Initial Developer of the Original Code is Aaron Leventhal.
+# The Original Code is mozilla.org Code.
-# Portions created by Aaron Leventhal are Copyright (C) 2001
+#
-# Aaron Leventhal. All Rights Reserved.
+# The Initial Developer of the Original Code is
-
+# Aaron Leventhal.
-# Alternatively, the contents of this file may be used under the terms
+# Portions created by the Initial Developer are Copyright (C) 2001
-# of the GNU General Public License (the "GPL"), in which case the
+# the Initial Developer. All Rights Reserved.
-# provisions of the GPL are applicable instead of those above.  If you
+#
-# wish to allow use of your version of this file only under the terms of
-# the GPL and not to allow others to use your version of this file under
-# the MPL, indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by the
-# GPL. If you do not delete the provisions above, a recipient may use
-# your version of this file under either the MPL or the GPL.
-
 # 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 *****
 
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@

toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,14 +14,14 @@
  *
  * 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.
  *
- * Contributor(s): Aaron Leventhal (aaronl@netscape.com)
+ * Contributor(s):
- *                 Blake Ross      (blake@cs.stanford.edu)
+ *   Aaron Leventhal (aaronl@netscape.com)
- *
+ *   Blake Ross      (blake@cs.stanford.edu)
  *
  * 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
@@ -29,11 +29,11 @@
  * 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 ***** */
 

toolkit/components/typeaheadfind/src/nsTypeAheadFind.h

@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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,16 +14,14 @@
  *
  * 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.
  *
  * Contributor(s):
- * Original Authors: Aaron Leventhal (aaronl@netscape.com)
+ *   Aaron Leventhal (aaronl@netscape.com)
- *                   Blake Ross      (blake@cs.stanford.edu)
+ *   Blake Ross      (blake@cs.stanford.edu)
- * Contributors:    
- *
  *
  * 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
@@ -31,11 +29,11 @@
  * 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 ***** */
 

toolkit/components/viewsource/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 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     = ../../..

toolkit/components/viewsource/content/viewPartialSource.js

@@ -1,5 +1,5 @@
 # -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# **** BEGIN LICENSE BLOCK ****
+# ***** 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
@@ -14,7 +14,8 @@
 #
 # The Original Code is mozilla.org view-source front-end.
 #
-# The Initial Developer of the Original Code is mozilla.org.
+# The Initial Developer of the Original Code is
+# mozilla.org.
 # Portions created by the Initial Developer are Copyright (C) 2002
 # the Initial Developer. All Rights Reserved.
 #
@@ -35,7 +36,7 @@
 # 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 ****
+# ***** END LICENSE BLOCK *****
 
 var gDebug = 0;
 var gLineCount = 0;

toolkit/components/viewsource/content/viewSource.js

@@ -1,25 +1,41 @@
 # -*- Mode: Java; tab-width: 2; 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/
-# 
-# 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
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-#    Doron Rosenberg (doronr@naboonline.com) 
-#    Neil Rashbrook (neil@parkwaycc.co.uk)
 #
+# 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.  Portions created by Netscape are Copyright (C) Netscape Communications Corporation.  All Rights Reserved.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Doron Rosenberg (doronr@naboonline.com)
+#   Neil Rashbrook (neil@parkwaycc.co.uk)
+#
+# 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 *****
 
 const pageLoaderIface = Components.interfaces.nsIWebPageDescriptor;
 const nsISelectionPrivate = Components.interfaces.nsISelectionPrivate;

toolkit/content/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 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     = ../..

toolkit/content/about.xhtml

@@ -8,30 +8,45 @@
 %licenseDTD;
 ]>
 
-<!--
+<!-- ***** BEGIN LICENSE BLOCK *****
-   - The contents of this file are subject to the Netscape Public
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   - 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 contents of this file are subject to the Mozilla Public License Version
-   - the License at http://www.mozilla.org/NPL/
+   - 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
-   - Software distributed under the License is distributed on an "AS
+   - http://www.mozilla.org/MPL/
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   -
-   - implied. See the License for the specific language governing
+   - Software distributed under the License is distributed on an "AS IS" basis,
-   - rights and limitations under the License.
+   - 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 Communicator client code, released
    - March 31, 1998.
-   - 
+   -
-   - 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-1999 Netscape Communications Corporation. All
+   - Portions created by the Initial Developer are Copyright (C) 1998-1999
-   - Rights Reserved.
+   - the Initial Developer. All Rights Reserved.
-   - 
+   -
-   - Contributor(s): 
+   - Contributor(s):
-   -    Henrik Gemal <mozilla@gemal.dk>
+   -   Henrik Gemal <mozilla@gemal.dk>
-   -    Daniel Veditz <dveditz@netscape.com>
+   -   Daniel Veditz <dveditz@netscape.com>
-   -    Alexey Chernyak <alexeyc@bigfoot.com>
+   -   Alexey Chernyak <alexeyc@bigfoot.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
+   - 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 ***** -->
   
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>

toolkit/content/commonDialog.js

@@ -1,10 +1,10 @@
 /* ***** 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
@@ -13,28 +13,28 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
  * Contributor(s):
- *  Alec Flett  <alecf@netscape.com>
+ *   Alec Flett  <alecf@netscape.com>
- *  Ben Goodger <ben@netscape.com>
+ *   Ben Goodger <ben@netscape.com>
- *  Blake Ross  <blakeross@telocity.com>
+ *   Blake Ross  <blakeross@telocity.com>
- *  Joe Hewitt <hewitt@netscape.com>
+ *   Joe Hewitt <hewitt@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 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 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 ***** */
 

toolkit/content/customizeToolbar.css

@@ -1,27 +1,41 @@
-/*  
+/* ***** BEGIN LICENSE BLOCK *****
-  The contents of this file are subject to the Netscape Public
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  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/NPL/
-  
-  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 Communicator client code, released
-  March 31, 1998.
-  
-  The Initial Developer of the Original Code is David Hyatt. 
-  Portions created by David Hyatt are
-  Copyright (C) 2002 David Hyatt. All
-  Rights Reserved.
-  
-  Contributor(s): 
-    David Hyatt (hyatt@apple.com)
-    Blake Ross (blaker@netscape.com)
 
-*/
+ 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 Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ David Hyatt.
+ Portions created by the Initial Developer are Copyright (C) 2002
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+   David Hyatt (hyatt@apple.com)
+   Blake Ross (blaker@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
+ 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 ***** */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */

toolkit/content/customizeToolbar.js

@@ -1,25 +1,42 @@
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# The Initial Developer of the Original Code is David Hyatt. 
+# The Initial Developer of the Original Code is
-# Portions created by David Hyatt are
+# David Hyatt.
-# Copyright (C) 2002 David Hyatt. All
+# Portions created by the Initial Developer are Copyright (C) 2002
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-# 
+#
-# Contributor(s): 
+# Contributor(s):
 #   David Hyatt (hyatt@apple.com)
 #   Blake Ross (blaker@netscape.com)
 #   Joe Hewitt (hewitt@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
+# 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 *****
 
 const kRowMax = 4;
 const kWindowWidth = 635;

toolkit/content/customizeToolbar.xul

@@ -1,26 +1,43 @@
 <?xml version="1.0"?> 
 
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# 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-1999 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-# 
+#
-# Contributor(s): 
+# Contributor(s):
 #   David Hyatt (hyatt@apple.com)
 #   Blake Ross (blaker@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
+# 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 *****
 
 <!DOCTYPE dialog [
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">

toolkit/content/findUtils.js

@@ -1,41 +1,41 @@
 # -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 # ***** 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
 # 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 
+# 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.
-# 
+#
 # Contributor(s):
 #   Simon Fraser <sfraser@netscape.com>
 #   Dean Tessman <dean_tessman@hotmail.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 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 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 ***** */
+# ***** END LICENSE BLOCK *****
 var gPromptService;
 var gFindBundle;
 

toolkit/content/finddialog.js

@@ -1,30 +1,48 @@
 # -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 #
-# 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/
 #
-# The Original Code is Mozilla Communicator client code, released March
+# Software distributed under the License is distributed on an "AS IS" basis,
-# 31, 1998.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# The Initial Developer of the Original Code is Netscape Communications
+# The Original Code is Mozilla Communicator client code, released
-# Corporation. Portions created by Netscape are
+# March 31, 1998.
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
 #
-# Contributor(s): Alec Flett       <alecf@netscape.com>
+# The Initial Developer of the Original Code is
-#                 Bill Law         <law@netscape.com>
+# Netscape Communications Corporation.
-#                 Blake Ross       <blakeross@telocity.com>
+# Portions created by the Initial Developer are Copyright (C) 1998
-#                 Dean Tessman     <dean_tessman@hotmail.com>
+# the Initial Developer. All Rights Reserved.
-#                 Matt Fisher      <matt@netscape.com>
+#
-#                 Simon Fraser     <sfraser@netscape.com>
+# Contributor(s):
-#                 Stuart Parmenter <pavlov@netscape.com>
+#   Alec Flett       <alecf@netscape.com>
+#   Bill Law         <law@netscape.com>
+#   Blake Ross       <blakeross@telocity.com>
+#   Dean Tessman     <dean_tessman@hotmail.com>
+#   Matt Fisher      <matt@netscape.com>
+#   Simon Fraser     <sfraser@netscape.com>
+#   Stuart Parmenter <pavlov@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
+# 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 *****
 
 var dialog;     // Quick access to document/form elements.
 var gFindInst;   // nsIWebBrowserFind that we're going to use

toolkit/content/finddialog.xul

@@ -1,30 +1,47 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
-# 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/
+# 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 Mozilla Communicator client code, released
 # March 31, 1998.
-# 
+#
-# 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-1999 Netscape Communications Corporation. All
+# Portions created by the Initial Developer are Copyright (C) 1998-1999
-# Rights Reserved.
+# the Initial Developer. All Rights Reserved.
-#  
+#
-# Contributor(s): 
+# Contributor(s):
-#                 Ben Goodger      <ben@netscape.com>
+#   Ben Goodger      <ben@netscape.com>
-#                 Bill Law         <law@netscape.com>
+#   Bill Law         <law@netscape.com>
-#                 Blake Ross       <blaker@netscape.com>
+#   Blake Ross       <blaker@netscape.com>
-#                 Dan Rosen        <dr@netscape.com>
+#   Dan Rosen        <dr@netscape.com>
-#                 Dean Tessman     <dean_tessman@hotmail.com>
+#   Dean Tessman     <dean_tessman@hotmail.com>
-#                 Simon Fraser     <sfraser@netscape.com>
+#   Simon Fraser     <sfraser@netscape.com>
-#                 Stuart Parmenter <pavlov@netscape.com>
+#   Stuart Parmenter <pavlov@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
+# 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 *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 

toolkit/content/fullScreen.js

@@ -1,11 +1,11 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 @@
  *   Joe Hewitt <hewitt@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 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 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 ***** */
 

toolkit/content/mozilla.xhtml

@@ -6,27 +6,44 @@
   %mozillaDTD;
 ]>
 
-<!--
+<!-- ***** BEGIN LICENSE BLOCK *****
-   The contents of this file are subject to the Netscape Public License
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   Version 1.0 (the "NPL"); you may not use this file except in
+   -
-   compliance with the NPL.  You may obtain a copy of the NPL at
+   - The contents of this file are subject to the Mozilla Public License Version
-   http://www.mozilla.org/NPL/
+   - 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
-   Software distributed under the NPL is distributed on an "AS IS" basis,
+   - http://www.mozilla.org/MPL/
-   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+   -
-   for the specific language governing rights and limitations under the
+   - Software distributed under the License is distributed on an "AS IS" basis,
-   NPL.
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  
+   - for the specific language governing rights and limitations under the
-   The Initial Developer of this code under the NPL is Netscape
+   - License.
-   Communications Corporation.  Portions created by Netscape are
+   -
-   Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+   - The Original Code is mozilla.org Code.
-   Reserved.
+   -
-   
+   - The Initial Developer of the Original Code is
-   Contributor(s):
+   - Netscape Communications Corporation.
-     Neil Deakin <enndeakin@sympatico.ca>
+   - Portions created by the Initial Developer are Copyright (C) 1998
-     Henrik Gemal <mozilla@gemal.dk>
+   - the Initial Developer. All Rights Reserved.
-     Alexey Chernyak <alexeyc@bigfoot.com> (XHTML 1.1 conversion)
+   -
- -->
+   - Contributor(s):
+   -   Neil Deakin <enndeakin@sympatico.ca>
+   -   Henrik Gemal <mozilla@gemal.dk>
+   -   Alexey Chernyak <alexeyc@bigfoot.com> (XHTML 1.1 conversion)
+   -
+   - 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 ***** -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>

toolkit/content/nsDragAndDrop.js

@@ -1,40 +1,40 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 # ***** 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
 # 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 
+# 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.
-# 
+#
 # Contributor(s):
 #   Ben Goodger <ben@netscape.com> (Original Author)
 #   Pierre Chanial <pierrechanial@netscape.net>
-# 
+#
 # 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 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 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 *****
 
 /** 

toolkit/content/nsTransferable.js

@@ -1,11 +1,11 @@
 /* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** 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 @@
  *   Ben Goodger <ben@netscape.com> (Original Author)
  *
  * 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 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 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 ***** */
 

toolkit/content/nsWidgetStateManager.js

@@ -1,30 +1,48 @@
 # -*- Mode: Java; tab-width: 2; c-basic-offset: 2; -*-
 #
-# The contents of this file are subject to the Netscape Public License
+# ***** BEGIN LICENSE BLOCK *****
-# Version 1.0 (the "NPL"); you may not use this file except in
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
 #
-# Software distributed under the NPL is distributed on an "AS IS" basis,
+# The contents of this file are subject to the Mozilla Public License Version
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# 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
-# NPL.
+# License.
 #
-# The Initial Developer of this code under the NPL is Netscape
+# The Original Code is mozilla.org Code.
-# Communications Corporation.  Portions created by Netscape are
+#
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# The Initial Developer of the Original Code is
-# Reserved.
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Ben Goodger <mozilla@bengoodger.com> (Original Author)
 #
+# 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 *****
+
 # ... and so it came to pass that on the 4th day of June, A.D. 2003, this file
 # was excised of the cruel and unfortunate brace/indentation scheme perpetrated
 # upon it by the same author who now writes these words, some three years and 
 # two months after the original act. Note that while cvs blame shifts like leaves
 # in the autumn breeze, by and large the responsibility for this code remains 
 # with me. 
-#   
 
 var wsm;
 

toolkit/content/selectDialog.js

@@ -1,11 +1,11 @@
 /* -*- Mode: Java; 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,25 +14,25 @@
  *
  * The Original Code is Mozilla Communicator client 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.
  *
  * Contributor(s):
- * Alec Flett <alecf@netscape.com>
+ *   Alec Flett <alecf@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 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 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 ***** */
 

toolkit/content/selectDialog.xul

@@ -1,24 +1,41 @@
 <?xml version="1.0"?> 
 
-<!-- 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/
 
-The Original Code is Mozilla Communicator client code, released
+ Software distributed under the License is distributed on an "AS IS" basis,
-March 31, 1998.
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
 
-The Initial Developer of the Original Code is Netscape
+ The Original Code is Mozilla Communicator client code, released
-Communications Corporation. Portions created by Netscape are
+ March 31, 1998.
-Copyright (C) 1998-1999 Netscape Communications Corporation. All
-Rights Reserved.
 
-Contributor(s): ______________________________________. -->
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ 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 ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">

toolkit/content/viewZoomOverlay.js

@@ -1,37 +1,42 @@
 # -*- Mode: Java; tab-width: 2; 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
-# The Original Code is this file as it was released upon
+# for the specific language governing rights and limitations under the
-# January 6, 2001.
+# License.
-# 
+#
-# The Initial Developer of the Original Code is Peter Annema.
+# The Original Code is this file as it was released upon January 6, 2001.
-# Portions created by Peter Annema are Copyright (C) 2000
+#
-# Peter Annema. All Rights Reserved.
+# The Initial Developer of the Original Code is
-# 
+# Peter Annema.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
 # Contributor(s):
 #   Peter Annema <disttsc@bart.nl> (Original Author)
 #   Jonas Sicking <sicking@bigfoot.com>
-# 
+#
-# Alternatively, the contents of this file may be used under the
+# Alternatively, the contents of this file may be used under the terms of
-# terms of the GNU General Public License Version 2 or later (the
+# either the GNU General Public License Version 2 or later (the "GPL"), or
-# "GPL"), in which case the provisions of the GPL are applicable
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# instead of those above.  If you wish to allow use of your
+# in which case the provisions of the GPL or the LGPL are applicable instead
-# version of this file only under the terms of the GPL and not to
+# of those above. If you wish to allow use of your version of this file only
-# allow others to use your version of this file under the MPL,
+# under the terms of either the GPL or the LGPL, and not to allow others to
-# indicate your decision by deleting the provisions above and
+# use your version of this file under the terms of the MPL, indicate your
-# replace them with the notice and other provisions required by
+# decision by deleting the provisions above and replace them with the notice
-# the GPL.  If you do not delete the provisions above, a recipient
+# and other provisions required by the GPL or the LGPL. If you do not delete
-# may use your version of this file under either the MPL or the
+# the provisions above, a recipient may use your version of this file under
-# GPL.
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 /** Document Zoom Management Code
  *

toolkit/content/widgets/autocomplete.xml

@@ -2,38 +2,40 @@
 
 # -*- Mode: HTML -*-
 # ***** BEGIN LICENSE BLOCK *****
-# The contents of this file are subject to the Mozilla Public
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 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 mozilla.org browser.
-# 
-# The Initial Developer of the Original Code is Joe Hewitt.
-# Portions created by the Initial Developer are
-# Copyright (C) 2003 the Initial Developer.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#     Pierre Chanial (p_ch@verizon.net)
-#     Dean Tessman   (dean_tessman@hotmail.com)
 #
-# Alternatively, the contents of this file may be used under the
+# The contents of this file are subject to the Mozilla Public License Version
-# terms of the GNU General Public License Version 2 or later (the
+# 1.1 (the "License"); you may not use this file except in compliance with
-# "GPL"), in which case the provisions of the GPL are applicable 
+# the License. You may obtain a copy of the License at
-# instead of those above.  If you wish to allow use of your 
+# http://www.mozilla.org/MPL/
-# version of this file only under the terms of the GPL and not to
+#
-# allow others to use your version of this file under the MPL,
+# Software distributed under the License is distributed on an "AS IS" basis,
-# indicate your decision by deleting the provisions above and
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# replace them with the notice and other provisions required by
+# for the specific language governing rights and limitations under the
-# the GPL.  If you do not delete the provisions above, a recipient
+# License.
-# may use your version of this file under either the MPL or the
+#
-# GPL.
+# The Original Code is mozilla.org browser.
+#
+# The Initial Developer of the Original Code is
+# Joe Hewitt.
+# Portions created by the Initial Developer are Copyright (C) 2003
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Pierre Chanial (p_ch@verizon.net)
+#   Dean Tessman   (dean_tessman@hotmail.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
+# 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 *****