Bug 715549 - remove last vestiges of tri-licence. DONTBUILD.
authorGervase Markham <gerv@gerv.net>
Fri, 19 Jul 2013 16:08:33 +0100
changeset 151537 3f7dab57851c4d7b33616ec13d037830d88d2d0a
parent 151536 f0f4f06a071a0c808b59dbf4a6909524c1a051ee
child 151538 6165611d666f70c80400fdae17a0e5e2ff3c0a68
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs715549
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 715549 - remove last vestiges of tri-licence. DONTBUILD.
build/macosx/universal/unify
build/package/mac_osx/pkg-dmg
build/pgo/js-input/string-base64.html
dom/interfaces/css/nsIDOMCSSFontFeatureValuesRule.idl
gfx/thebes/gfxSVGGlyphs.cpp
gfx/thebes/gfxSVGGlyphs.h
image/public/imgIOnloadBlocker.idl
intl/locales/af/hyphenation/LICENSE
intl/locales/bg/hyphenation/LICENSE
intl/locales/ca/hyphenation/LICENSE
intl/locales/cy/hyphenation/LICENSE
intl/locales/da/hyphenation/LICENSE
intl/locales/de-1901/hyphenation/LICENSE
intl/locales/de-1996/hyphenation/LICENSE
intl/locales/de-CH/hyphenation/LICENSE
intl/locales/eo/hyphenation/LICENSE
intl/locales/es/hyphenation/LICENSE
intl/locales/et/hyphenation/LICENSE
intl/locales/gl/hyphenation/LICENSE
intl/locales/hr/hyphenation/LICENSE
intl/locales/hsb/hyphenation/LICENSE
intl/locales/hu/hyphenation/LICENSE
intl/locales/ia/hyphenation/LICENSE
intl/locales/is/hyphenation/LICENSE
intl/locales/it/hyphenation/LICENSE
intl/locales/kmr/hyphenation/LICENSE
intl/locales/la/hyphenation/LICENSE
intl/locales/lt/hyphenation/LICENSE
intl/locales/mn/hyphenation/LICENSE
intl/locales/nl/hyphenation/LICENSE
intl/locales/pt/hyphenation/LICENSE
intl/locales/ru/hyphenation/LICENSE
intl/locales/sh/hyphenation/LICENSE
intl/locales/sl/hyphenation/LICENSE
intl/locales/sv/hyphenation/LICENSE
intl/locales/tr/hyphenation/LICENSE
intl/locales/uk/hyphenation/LICENSE
js/xpconnect/tests/unit/test_tearoffs.js
media/mtransport/third_party/Makefile.in
media/webrtc/webrtc-config.mk
testing/mozbase/mozlog/setup.py
widget/nsIWidgetListener.h
--- a/build/macosx/universal/unify
+++ b/build/macosx/universal/unify
@@ -134,17 +134,17 @@ unify --only-one fail /usr/local /nfs/x8
 
 The only esoteric requirement of B<unify> is that the L<lipo(1)> command
 be available.  It is present on Mac OS X systems at least as early as
 10.3.9, and probably earlier.  Mac OS X 10.4 ("Tiger") or later are
 recommended.
 
 =head1 LICENSE
 
-MPL 1.1/GPL 2.0/LGPL 2.1.  Your choice
+MPL 2.
 
 =head1 AUTHOR
 
 The software was initially written by Mark Mentovai; copyright 2006
 Google Inc.
 
 =head1 SEE ALSO
 
--- a/build/package/mac_osx/pkg-dmg
+++ b/build/package/mac_osx/pkg-dmg
@@ -220,17 +220,17 @@ pkg-dmg --source /Applications/DeerPark.
 
 I<pkg-dmg> has been tested with Mac OS X releases 10.2 ("Jaguar")
 through 10.4 ("Tiger").  Certain adjustments to behavior are made
 depending on the host system's release.  Mac OS X 10.3 ("Panther") or
 later are recommended.
 
 =head1 LICENSE
 
-MPL 1.1/GPL 2.0/LGPL 2.1.  Your choice.
+MPL 2.
 
 =head1 AUTHOR
 
 Mark Mentovai
 
 =head1 SEE ALSO
 
 L<bless(8)>, L<diskutil(8)>, L<hdid(8)>, L<hdiutil(1)>, L<Rez(1)>,
--- a/build/pgo/js-input/string-base64.html
+++ b/build/pgo/js-input/string-base64.html
@@ -33,53 +33,19 @@
 <h3>string-base64</h3>
 <div id="console">
 </div>
 
 <script>
 
 var _sunSpiderStartDate = new Date();
 
-/* ***** 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 XML-RPC Client component.
- *
- * The Initial Developer of the Original Code is
- * Digital Creations 2, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Martijn Pieters <mj@digicool.com> (original author)
- *   Samuel Sieb <samuel@sieb.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
- * 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 Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // From: http://lxr.mozilla.org/mozilla/source/extensions/xml-rpc/src/nsXmlRpcClient.js#956
 
 /* Convert data (an array of integers) to a Base64 string. */
 var toBase64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 var base64Pad = '=';
 
 function toBase64(data) {
--- a/dom/interfaces/css/nsIDOMCSSFontFeatureValuesRule.idl
+++ b/dom/interfaces/css/nsIDOMCSSFontFeatureValuesRule.idl
@@ -1,44 +1,12 @@
 /* -*- Mode: IDL; tab-width: 2; 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 the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   John Daggett <jdaggett@mozilla.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 ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIDOMCSSRule.idl"
 
 [scriptable, uuid(f4cb1776-389d-4f52-a4d8-68bea5bd00c1)]
 interface nsIDOMCSSFontFeatureValuesRule : nsIDOMCSSRule
 {
   attribute DOMString fontFamily;
                       // raises(DOMException) on setting
--- a/gfx/thebes/gfxSVGGlyphs.cpp
+++ b/gfx/thebes/gfxSVGGlyphs.cpp
@@ -1,43 +1,11 @@
-/* ***** 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 Foundation code.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Edwin Flores <eflores@mozilla.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 ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gfxSVGGlyphs.h"
 
 #include "nscore.h"
 #include "nsError.h"
 #include "nsAutoPtr.h"
 #include "nsIParser.h"
 #include "nsIDOMNodeList.h"
--- a/gfx/thebes/gfxSVGGlyphs.h
+++ b/gfx/thebes/gfxSVGGlyphs.h
@@ -1,43 +1,11 @@
-/* ***** 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 Foundation code.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Edwin Flores <eflores@mozilla.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 ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef GFX_SVG_GLYPHS_WRAPPER_H
 #define GFX_SVG_GLYPHS_WRAPPER_H
 
 #include "gfxFontUtils.h"
 #include "nsString.h"
 #include "nsIDocument.h"
 #include "nsAutoPtr.h"
--- a/image/public/imgIOnloadBlocker.idl
+++ b/image/public/imgIOnloadBlocker.idl
@@ -1,45 +1,13 @@
 /* -*- Mode: C++; tab-width: 2; 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 Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2012
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Kyle Huey <me@kylehuey.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 ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
 
 interface imgIRequest;
 
 [uuid(dc126d90-0ee0-4683-b942-2fa66e443abc)]
 interface imgIOnloadBlocker : nsISupports
 {
--- a/intl/locales/af/hyphenation/LICENSE
+++ b/intl/locales/af/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_af.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/bg/hyphenation/LICENSE
+++ b/intl/locales/bg/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_bg.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/ca/hyphenation/LICENSE
+++ b/intl/locales/ca/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_ca.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/cy/hyphenation/LICENSE
+++ b/intl/locales/cy/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_cy.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/da/hyphenation/LICENSE
+++ b/intl/locales/da/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_da.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/de-1901/hyphenation/LICENSE
+++ b/intl/locales/de-1901/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_de-1901.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/de-1996/hyphenation/LICENSE
+++ b/intl/locales/de-1996/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_de-1996.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/de-CH/hyphenation/LICENSE
+++ b/intl/locales/de-CH/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_de-CH.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/eo/hyphenation/LICENSE
+++ b/intl/locales/eo/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_eo.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/es/hyphenation/LICENSE
+++ b/intl/locales/es/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_es.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/et/hyphenation/LICENSE
+++ b/intl/locales/et/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_et.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/gl/hyphenation/LICENSE
+++ b/intl/locales/gl/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_gl.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/hr/hyphenation/LICENSE
+++ b/intl/locales/hr/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_hr.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/hsb/hyphenation/LICENSE
+++ b/intl/locales/hsb/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_hsb.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/hu/hyphenation/LICENSE
+++ b/intl/locales/hu/hyphenation/LICENSE
@@ -1,44 +1,11 @@
 License information for hyph_hu.dic:
 
 Derived from hyph_hu.tex in the "huhyphn" package <https://github.com/nagybence/huhyphn>,
 by processing the TeX hyphenation patterns with substrings.pl.
 
 % Huhyphn - hungarian hyphenation patterns v20110815
 %
-% ***** BEGIN LICENSE BLOCK *****
-% Version: MPL 1.1/GPL 2.0/LGPL 2.1
-%
-% The contents of this file are subject to the Mozilla Public License Version
-% 1.1 (the "License"); you may not use this file except in compliance with
-% the License. You may obtain a copy of the License at
-% http://www.mozilla.org/MPL/
-%
-% Software distributed under the License is distributed on an "AS IS" basis,
-% WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-% for the specific language governing rights and limitations under the
-% License.
-%
-% The Original Code is the Huhyphn - hungarian hyphenation patterns.
+% This Source Code Form is subject to the terms of the Mozilla Public
+% License, v. 2.0. If a copy of the MPL was not distributed with this
+% file, You can obtain one at http://mozilla.org/MPL/2.0/.
 %
-% The Initial Developer of the Original Code is
-% Bence Nagy.
-% Portions created by the Initial Developer are Copyright (C) 2003
-% the Initial Developer. All Rights Reserved.
-%
-% Contributor(s):
-%   Bence Nagy <bence.nagy@gmail.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 *****
-%
--- a/intl/locales/ia/hyphenation/LICENSE
+++ b/intl/locales/ia/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_ia.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/is/hyphenation/LICENSE
+++ b/intl/locales/is/hyphenation/LICENSE
@@ -1,55 +1,17 @@
 License information for hyph_is.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-At the time this file was first modified, a complete, unmodified copy of
-the LPPL Work was available from:
-http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 Portions of this file were originally made available under the following license
 (copied verbatim from hyph-is.lic.txt in the original work):
 
 Icelandic hyphenation patterns
 
--- a/intl/locales/it/hyphenation/LICENSE
+++ b/intl/locales/it/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_it.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/kmr/hyphenation/LICENSE
+++ b/intl/locales/kmr/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_kmr.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/la/hyphenation/LICENSE
+++ b/intl/locales/la/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_la.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/lt/hyphenation/LICENSE
+++ b/intl/locales/lt/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_lt.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 and the original Lithuanian TeX package (from which this was derived) was available from:
--- a/intl/locales/mn/hyphenation/LICENSE
+++ b/intl/locales/mn/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_mn.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/nl/hyphenation/LICENSE
+++ b/intl/locales/nl/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_nl.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/pt/hyphenation/LICENSE
+++ b/intl/locales/pt/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_pt.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/ru/hyphenation/LICENSE
+++ b/intl/locales/ru/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_ru.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/sh/hyphenation/LICENSE
+++ b/intl/locales/sh/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_sh.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/sl/hyphenation/LICENSE
+++ b/intl/locales/sl/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_sl.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/sv/hyphenation/LICENSE
+++ b/intl/locales/sv/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_sv.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/tr/hyphenation/LICENSE
+++ b/intl/locales/tr/hyphenation/LICENSE
@@ -1,49 +1,17 @@
 License information for hyph_tr.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/intl/locales/uk/hyphenation/LICENSE
+++ b/intl/locales/uk/hyphenation/LICENSE
@@ -1,49 +1,16 @@
 License information for hyph_uk.dic:
 
 This file is based on the TeX hyphenation patterns distributed under the
 LaTeX Project Public License (LPPL) as part of the hyph-utf8 package.
 
-***** 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 hyphenation service.
-
-The Initial Developer of the Original Code is
-Mozilla Foundation.
-Portions created by the Initial Developer are Copyright (C) 2011
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Jonathan Kew <jfkthame@gmail.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 *****
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 At the time this file was first modified, a complete, unmodified copy of
 the LPPL Work was available from:
 http://tug.org/svn/texhyphen/trunk/hyph-utf8/tex/generic/hyph-utf8/patterns/?pathrev=580
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/js/xpconnect/tests/unit/test_tearoffs.js
+++ b/js/xpconnect/tests/unit/test_tearoffs.js
@@ -1,43 +1,11 @@
-/* ***** 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 XPConnect Test Code.
- *
- * The Initial Developer of the Original Code is The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Bobby Holley <bobbyholley@gmail.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 ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 function run_test() {
 
   // Load the component manifest containing our test interface implementations.
   Components.manager.autoRegister(do_get_file('../components/js/xpctest.manifest'));
--- a/media/mtransport/third_party/Makefile.in
+++ b/media/mtransport/third_party/Makefile.in
@@ -1,44 +1,11 @@
-# ***** 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 code.
-#
-# The Initial Developer of the Original Code is the Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Chris Pearce <chris@pearce.org.nz>
-#  Eric Rescorla <ekr@rtfm.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 *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
--- a/media/webrtc/webrtc-config.mk
+++ b/media/webrtc/webrtc-config.mk
@@ -1,43 +1,11 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla platform.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation <http://www.mozilla.org/>.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifndef INCLUDED_CONFIG_MK
 $(error Must include config.mk before this file.)
 endif
 
 ifdef WEBRTC_CONFIG_INCLUDED
 $(error Must not include webrtc-config.mk twice.)
 endif
--- a/testing/mozbase/mozlog/setup.py
+++ b/testing/mozbase/mozlog/setup.py
@@ -19,20 +19,20 @@ except IOError, OSError:
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,
       description=desc,
       long_description=description,
       author='Mozilla Automation and Testing Team',
       author_email='tools@lists.mozilla.org',
       url='https://wiki.mozilla.org/Auto-tools/Projects/MozBase',
-      license='MPL 1.1/GPL 2.0/LGPL 2.1',
+      license='MPL 2',
       packages=['mozlog'],
       zip_safe=False,
       platforms =['Any'],
       classifiers=['Development Status :: 4 - Beta',
                    'Environment :: Console',
                    'Intended Audience :: Developers',
-                   'License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)',
-                   'Operating System :: OS Independent',
+                   'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
+                   ' Operating System :: OS Independent',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                   ]
      )
--- a/widget/nsIWidgetListener.h
+++ b/widget/nsIWidgetListener.h
@@ -1,42 +1,11 @@
-/* ***** 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 mozila.org code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * 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 Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsIWidgetListener_h__
 #define nsIWidgetListener_h__
 
 #include "nscore.h"
 #include "nsGUIEvent.h"
 #include "nsIXULWindow.h"