Update license for included self-hosted ES6 code

1 files changed, 18 insertions, 16 deletions

diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 09be29c30..e12e911bf 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -67,7 +67,7 @@
       <li><a href="about:license#easyexif">EasyEXIF License</a></li>
       <li><a href="about:license#edl">Eclipse Distribution License</a></li>
       <li><a href="about:license#hunspell-ee">Estonian Spellchecking Dictionary License</a></li>
-      <li><a href="about:license#es6-promise">ES6-promise License</a></li>
+      <li><a href="about:license#es6-shim">ES6-shim License</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#firebug">Firebug License</a></li>
       <li><a href="about:license#gfx-font-list">gfxFontList License</a></li>
@@ -1302,33 +1302,35 @@ Phone &amp; Fax: +372 6411443
 
     <hr>
 
-    <h1><a id="es6-promise"></a>ES6-Promise License</h1>
+    <h1><a id="es6-shim"></a>ES6-shim License</h1>
 
     <p>This license applies to the code
-    <span class="path">browser/base/content/promises/data/es6-promise.code.js</span>.</p>
+    <span class="path">browser/base/content/promises/data/es6-shim.js</span>.</p>
 
 <pre>
-Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.
-Conversion to ES6 API by Jake Archibald.
-Changes required for integration into Pale Moon by Mark Straver.
+The project was initially based on es6-shim by Axel Rauschmayer.
+Current maintainers are: Paul Miller, Jordan Harband, and C. Scott Ananian.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+The MIT License (MIT)
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Copyright (c) 2013-2016 Paul Miller (http://paulmillr.com) and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 </pre>
 
     <hr>