diff --git a/mozilla/embedding/qa/jstests/networking/nsIProtocolHandler.html b/mozilla/embedding/qa/jstests/networking/nsIProtocolHandler.html
index c87d758a129..2ddd0112a0d 100644
--- a/mozilla/embedding/qa/jstests/networking/nsIProtocolHandler.html
+++ b/mozilla/embedding/qa/jstests/networking/nsIProtocolHandler.html
@@ -1,44 +1,40 @@
-
-
+
nsIProtocolHandler Tets case
diff --git a/mozilla/embedding/qa/jstests/profile/nsiprofile.html b/mozilla/embedding/qa/jstests/profile/nsiprofile.html
index deb96acd4a1..a3ab2bcf8dd 100644
--- a/mozilla/embedding/qa/jstests/profile/nsiprofile.html
+++ b/mozilla/embedding/qa/jstests/profile/nsiprofile.html
@@ -1,44 +1,41 @@
-
+
nsIProfile Tets case
diff --git a/mozilla/embedding/qa/jstests/xpcom/nsILocalFile.html b/mozilla/embedding/qa/jstests/xpcom/nsILocalFile.html
index c8edf9ca41c..ea3538fbabe 100644
--- a/mozilla/embedding/qa/jstests/xpcom/nsILocalFile.html
+++ b/mozilla/embedding/qa/jstests/xpcom/nsILocalFile.html
@@ -1,44 +1,40 @@
-
-
+
nsILocalFile Tets case
diff --git a/mozilla/embedding/tests/mfcembed/README.TXT b/mozilla/embedding/tests/mfcembed/README.TXT
index ab1c632a372..09fb4ea7f85 100644
--- a/mozilla/embedding/tests/mfcembed/README.TXT
+++ b/mozilla/embedding/tests/mfcembed/README.TXT
@@ -1,25 +1,39 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- * Chak Nanga
- */
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is mozilla.org code.
+
+The Initial Developer of the Original Code is
+Netscape Communications Corporation.
+Portions created by the Initial Developer are Copyright (C) 2___
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+ Chak Nanga
+
+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 sample shows how to embed Mozilla from within
an MFC Windows application
diff --git a/mozilla/extensions/irc/xul/tests/test2.css b/mozilla/extensions/irc/xul/tests/test2.css
index f306f1d267b..52d9b731c1f 100644
--- a/mozilla/extensions/irc/xul/tests/test2.css
+++ b/mozilla/extensions/irc/xul/tests/test2.css
@@ -1,22 +1,39 @@
-# 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 JSIRC Library.
-#
-# The Initial Developer of the Original Code is New Dimensions Consulting,
-# Inc. Portions created by New Dimensions Consulting, Inc. are
-# Copyright (C) 1999 New Dimenstions Consulting, Inc. All
-# Rights Reserved.
-#
-# Contributor(s):
-# Robert Ginda, rginda@ndcico.com, original author
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla JSIRC Library.
+ *
+ * The Initial Developer of the Original Code is
+ * New Dimensions Consulting, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Robert Ginda, rginda@ndcico.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 ***** */
foo {}
diff --git a/mozilla/extensions/python/xpcom/server/factory.py b/mozilla/extensions/python/xpcom/server/factory.py
index b732b18a8e6..e22bc340a46 100644
--- a/mozilla/extensions/python/xpcom/server/factory.py
+++ b/mozilla/extensions/python/xpcom/server/factory.py
@@ -1,19 +1,39 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+# 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.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
#
# The Original Code is the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# Class factory
#
diff --git a/mozilla/extensions/python/xpcom/test/test_component/py_test_component.py b/mozilla/extensions/python/xpcom/test/test_component/py_test_component.py
index 7c9c5aff48b..129a467dba6 100644
--- a/mozilla/extensions/python/xpcom/test/test_component/py_test_component.py
+++ b/mozilla/extensions/python/xpcom/test/test_component/py_test_component.py
@@ -1,19 +1,39 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+# 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.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
#
# The Original Code is the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# NOTE: This is a TEST interface, not a DEMO interface :-)
# We try to get as many data-types etc exposed, meaning this
diff --git a/mozilla/extensions/python/xpcom/test/test_isupports_primitives.py b/mozilla/extensions/python/xpcom/test/test_isupports_primitives.py
index 6d609d76bf6..92ec9c4087c 100644
--- a/mozilla/extensions/python/xpcom/test/test_isupports_primitives.py
+++ b/mozilla/extensions/python/xpcom/test/test_isupports_primitives.py
@@ -1,19 +1,39 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+# 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.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
#
# The Original Code is the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# Test our support for the interfaces defined in nsISupportsPrimitives.idl
#
@@ -127,4 +147,4 @@ def test():
raise RuntimeError, "Bad value: %s" % (int(ob),)
print "The nsISupports primitive interface tests appeared to work"
-test()
\ No newline at end of file
+test()
diff --git a/mozilla/extensions/python/xpcom/test/test_test_component.py b/mozilla/extensions/python/xpcom/test/test_test_component.py
index 6e18f4c3873..b91f189d64b 100644
--- a/mozilla/extensions/python/xpcom/test/test_test_component.py
+++ b/mozilla/extensions/python/xpcom/test/test_test_component.py
@@ -1,19 +1,39 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+# 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.
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
#
# The Original Code is the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
import sys, os, time
import xpcom.components
diff --git a/mozilla/gfx/src/ps/sample.unixpsfonts.properties b/mozilla/gfx/src/ps/sample.unixpsfonts.properties
index 0a8cc9dfdd1..9bab029dfc0 100644
--- a/mozilla/gfx/src/ps/sample.unixpsfonts.properties
+++ b/mozilla/gfx/src/ps/sample.unixpsfonts.properties
@@ -1,26 +1,39 @@
-##
-## The contents of this file are subject to the Netscape 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/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.org code.
-##
-## The Initial Developer of the Original Code is Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-##
-## Unix postscript printer font and encoding information
-##
-##
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 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 *****
+#
# ps font mapping
#
# Japanese font
diff --git a/mozilla/intl/unicharutil/tables/htmlEntityVersions.properties b/mozilla/intl/unicharutil/tables/htmlEntityVersions.properties
index e6f525e7a00..2ffc2d0be76 100644
--- a/mozilla/intl/unicharutil/tables/htmlEntityVersions.properties
+++ b/mozilla/intl/unicharutil/tables/htmlEntityVersions.properties
@@ -1,23 +1,40 @@
-##
-## The contents of this file are subject to the Netscape 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/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.org code.
-##
-## The Initial Developer of the Original Code is Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-##
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 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 *****
+
# LOCALIZATION NOTE: FILE
# This file associates internal names of entity lists to integers.
diff --git a/mozilla/layout/html/tests/block/interactive/bug105742-3.html b/mozilla/layout/html/tests/block/interactive/bug105742-3.html
index a98b423d874..d846f2b7559 100644
--- a/mozilla/layout/html/tests/block/interactive/bug105742-3.html
+++ b/mozilla/layout/html/tests/block/interactive/bug105742-3.html
@@ -8,32 +8,49 @@
inside anchor tags so this page breaks on Mozilla now that strict
dtd compliance is turned on. The page works fine with the 3.2
doctype.
--->mozilla.org Bugzilla -- the Mozilla bug database
-
-
+
+
+mozilla.org Bugzilla -- the Mozilla bug database
+
+
+
diff --git a/mozilla/layout/mathml/content/src/mathml.dtd b/mozilla/layout/mathml/content/src/mathml.dtd
index 4b502349256..d54f35261d6 100644
--- a/mozilla/layout/mathml/content/src/mathml.dtd
+++ b/mozilla/layout/mathml/content/src/mathml.dtd
@@ -1,31 +1,46 @@
-
+
+
Symbol Glyphs
-
-
-
diff --git a/mozilla/modules/staticmod/nsMetaModule.cpp.in b/mozilla/modules/staticmod/nsMetaModule.cpp.in
index 0b248e7f59f..8e22c2b5132 100644
--- a/mozilla/modules/staticmod/nsMetaModule.cpp.in
+++ b/mozilla/modules/staticmod/nsMetaModule.cpp.in
@@ -1,27 +1,42 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape 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/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
+ * 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.
+ * 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) 1998 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) 1998
+ * the Initial Developer. All Rights Reserved.
*
- * Contributor(s):
- * Christopher Seawood
- * Doug Turner
- * Chris Waterson
- */
+ * Contributor(s):
+ * Christopher Seawood
+ * Doug Turner
+ * Chris Waterson
+ *
+ * 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 ***** */
#line 27 "nsMetaModule.cpp.in"
#include "nsError.h"
diff --git a/mozilla/netwerk/necko-config.h.in b/mozilla/netwerk/necko-config.h.in
index d410f4bb940..c2990303879 100644
--- a/mozilla/netwerk/necko-config.h.in
+++ b/mozilla/netwerk/necko-config.h.in
@@ -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
- * 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/
+ * 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
@@ -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) 2003
* the Initial Developer. All Rights Reserved.
@@ -21,16 +21,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 ***** */
diff --git a/mozilla/parser/htmlparser/tests/outsinks/entityxif.xif b/mozilla/parser/htmlparser/tests/outsinks/entityxif.xif
index ee8843e01a7..d3564c464d0 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/entityxif.xif
+++ b/mozilla/parser/htmlparser/tests/outsinks/entityxif.xif
@@ -9,25 +9,42 @@
- -- The contents of this file are subject to the Netscape 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/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 Netscape
- -- Communications Corporation. Portions created by Netscape are
- -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
- -- Rights Reserved.
- --
- -- Contributor(s):
+ - ***** BEGIN LICENSE BLOCK *****
+ - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ -
+ - The contents of this file are subject to the Mozilla Public License Version
+ - 1.1 (the "License"); you may not use this file except in compliance with
+ - the License. You may obtain a copy of the License at
+ - http://www.mozilla.org/MPL/
+ -
+ - Software distributed under the License is distributed on an "AS IS" basis,
+ - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ - for the specific language governing rights and limitations under the
+ - License.
+ -
+ - The Original Code is Mozilla Communicator client code, released
+ - March 31, 1998.
+ -
+ - 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 LGPL or the GPL. 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 *****
diff --git a/mozilla/tools/leaky/leaky.h b/mozilla/tools/leaky/leaky.h
index 2b9f014100f..d64a7e88066 100644
--- a/mozilla/tools/leaky/leaky.h
+++ b/mozilla/tools/leaky/leaky.h
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 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 ***** */
#ifndef __leaky_h_
#define __leaky_h_
diff --git a/mozilla/tools/leaky/libmalloc.cpp b/mozilla/tools/leaky/libmalloc.cpp
index b03f869754f..a82278be466 100644
--- a/mozilla/tools/leaky/libmalloc.cpp
+++ b/mozilla/tools/leaky/libmalloc.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 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 ***** */
#include "libmalloc.h"
#include
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.js b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.js
index fc9d507c9b1..7978f4e6ba7 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.js
@@ -1,25 +1,40 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* 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) 2000 Netscape Communications Corporation. All
-* Rights Reserved.
-*
-* Contributor(s):
-* Adrian Havill
-*/
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is 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):
+ * Adrian Havill
+ *
+ * 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 ***** */
//GLOBALS
diff --git a/mozilla/xpfe/global/resources/locale/en-US/about.xhtml b/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
index 9323460685b..7b099b8565d 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
+++ b/mozilla/xpfe/global/resources/locale/en-US/about.xhtml
@@ -6,31 +6,45 @@
%brandDTD;
%regionDTD;
]>
-
-
+ -
+ - 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 LGPL or the GPL. 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 ***** -->
diff --git a/mozilla/xpinstall/test/pre_checkin_trigger.html b/mozilla/xpinstall/test/pre_checkin_trigger.html
index 061935f5d5c..884e0722859 100644
--- a/mozilla/xpinstall/test/pre_checkin_trigger.html
+++ b/mozilla/xpinstall/test/pre_checkin_trigger.html
@@ -1,26 +1,41 @@
-
-
+
XPInstall Pre-Checkin Trigger Test