Bug 322000: update about:licence to fulfil all our obligations with regard to notifications, copyright statements and so on. Patch by gerv; r=mconnor, mscott.

browser/base/content/credits.xhtml

@@ -334,20 +334,11 @@
         <p id="gecko" class="center">&credit.poweredByGecko;</p>
 
         <p class="footnote">
-          &brandFullName;&trade; &license.part0; copyright &copy;1998-2006 &license.part1;
+          &brandFullName;&trade; &license.part0; &copy;1998-2006 &license.part1;
           <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
           &license.part2;
-          <a href="" link="chrome://global/content/MPL-1.1.html" onclick="visitLink(event);">Mozilla Public License</a>
-          &license.and;
-          <a href="" link="chrome://global/content/NPL-1.1.html" onclick="visitLink(event);">Netscape Public License</a>&license.part3;</p>
-
-        <p class="footnote">
-          Portions of this software are Copyright &copy;1994 The Regents of the
-          University of California. All Rights Reserved.</p>
-
-        <p class="footnote">
-          This software may contain portions that are Copyright &copy;1998-2005
-          SupportSoft, Inc. All Rights Reserved.</p>
+          <a href="" link="about:license" onclick="visitLink(event);">about:license</a>
+          &license.part3;</p>
 
         <p class="footnote">
           Mozilla Firefox&trade; and the Firefox logo are trademarks of the Mozilla

mail/base/content/credits.xhtml

@@ -337,20 +337,11 @@
         <p id="gecko" class="center">&credit.poweredByGecko;</p>
 
         <p class="footnote">
-          &brandFullName;&trade; &license.part0; copyright &copy;1998-2006 &license.part1;
+          &brandFullName;&trade; &license.part0; &copy;1998-2006 &license.part1;
           <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
           &license.part2;
-          <a href="" link="chrome://global/content/MPL-1.1.html" onclick="visitLink(event);">Mozilla Public License</a>
-          &license.and;
-          <a href="" link="chrome://global/content/NPL-1.1.html" onclick="visitLink(event);">Netscape Public License</a>&license.part3;</p>
-
-        <p class="footnote">
-          Portions of this software are Copyright &copy;1994 The Regents of the
-          University of California. All Rights Reserved.</p>
-
-        <p class="footnote">
-          This software may contain portions that are Copyright &copy;1998-2005
-          SupportSoft, Inc. All Rights Reserved.</p>
+          <a href="" link="about:license" onclick="visitLink(event);">about:license</a>
+          &license.part3;</p>
 
         <p class="footnote">
           Mozilla Thunderbird&trade; and the Thunderbird logo are trademarks of the Mozilla 

mail/config/mail-jar.mn

@@ -108,8 +108,7 @@ content/global/printPageSetup.js,                     toolkit/content/global/pri
 content/global/printPageSetup.xul,                    toolkit/content/global/printPageSetup.xul
 content/global/printjoboptions.js,		      toolkit/content/global/printjoboptions.js
 content/global/printjoboptions.xul,		      toolkit/content/global/printjoboptions.xul
-content/global/MPL-1.1.html,                          toolkit/content/global/MPL-1.1.html
-content/global/NPL-1.1.html,                          toolkit/content/global/NPL-1.1.html
+content/global/license.html,                          toolkit/content/global/license.html
 content/global/customizeToolbar.xul,                  toolkit/content/global/customizeToolbar.xul
 content/global/customizeToolbar.js,                   toolkit/content/global/customizeToolbar.js
 content/global/customizeToolbar.css,                  toolkit/content/global/customizeToolbar.css

netwerk/protocol/about/src/nsAboutRedirector.cpp

@@ -66,8 +66,8 @@ static RedirEntry kRedirMap[] = {
     { "config", "chrome://global/content/config.xul", PR_FALSE },
     { "logo", "chrome://global/content/logo.gif", PR_TRUE },
     { "buildconfig", "chrome://global/content/buildconfig.html", PR_TRUE },
-    { "license", "chrome://global/content/MPL-1.1.html", PR_TRUE },
-    { "licence", "chrome://global/content/MPL-1.1.html", PR_TRUE },
+    { "license", "chrome://global/content/license.html", PR_TRUE },
+    { "licence", "chrome://global/content/license.html", PR_TRUE },
     { "about", "chrome://global/content/aboutAbout.html", PR_FALSE },
     { "neterror", "chrome://global/content/netError.xhtml", PR_TRUE }
 };

toolkit/content/jar.mn

@@ -2,8 +2,7 @@ toolkit.jar:
 %  content global %content/global/ xpcnativewrappers=yes
 %  content global-platform %content/global-platform/ platform xpcnativewrappers=yes
 %  content global-region %content/global-region/ xpcnativewrappers=yes
-+  content/global/MPL-1.1.html                (MPL-1.1.html)
-   content/global/NPL-1.1.html                (NPL-1.1.html)
++  content/global/license.html                (license.html)
    content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
 *  content/global/xul.css                     (xul.css)
 *  content/global/about.xhtml                 (about.xhtml)

toolkit/locales/en-US/chrome/global/license.dtd

@@ -1,7 +1,6 @@
-<!ENTITY license.part0     "is">
+<!ENTITY license.part0     "is copyright">
 <!ENTITY license.part1     "by its">
 <!ENTITY license.contrib   "contributors">
 <!ENTITY license.part2     "according to terms set out in the">
-<!ENTITY license.and       "and">
-<!ENTITY license.part3     ". All Rights Reserved.">
+<!ENTITY license.part3     "document. All Rights Reserved.">
 <!ENTITY license.credits   'For full Mozilla credits, type "about:credits" into the Location bar.'>

xpfe/global/jar.mn

@@ -47,8 +47,7 @@ toolkit.jar:
         content/global/fullScreen.js                (resources/content/fullScreen.js)
         content/global/build.dtd                    (build.dtd)
 *       content/global/about.xhtml                  (resources/content/about.xhtml) 
-        content/global/MPL-1.1.html                 (resources/content/MPL-1.1.html)
-        content/global/NPL-1.1.html                 (resources/content/NPL-1.1.html)
+        content/global/license.html                 (resources/content/license.html)
         content/global/bindings/browser.xml         (resources/content/bindings/browser.xml)
         content/global/bindings/button.xml          (resources/content/bindings/button.xml)
         content/global/bindings/checkbox.xml        (resources/content/bindings/checkbox.xml)