Bug 641195: Remove about:licence, but keep about:license. r=bsmedberg
authorSteffen Wilberg <steffen.wilberg@web.de>
Sat, 25 Jun 2011 09:56:11 +0200
changeset 71784 8be930c2f3c2a361e6e2e1001ebfebb3cb6ad456
parent 71783 f5a40a6bcddb515be4f117cd65018702b2e9acee
child 71785 28e4374838c43d6ce192380dd9136b8ca2b84d62
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs641195
milestone7.0a1
Bug 641195: Remove about:licence, but keep about:license. r=bsmedberg
docshell/base/nsAboutRedirector.cpp
toolkit/content/license.html
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -77,18 +77,16 @@ static RedirEntry kRedirMap[] = {
     { "crashes", "chrome://global/content/crashes.xhtml", 0 },
 #endif
     { "logo", "chrome://branding/content/about.png",
       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
     { "buildconfig", "chrome://global/content/buildconfig.html",
       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
     { "license", "chrome://global/content/license.html",
       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
-    { "licence", "chrome://global/content/license.html",
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
     { "neterror", "chrome://global/content/netError.xhtml",
       nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
       nsIAboutModule::ALLOW_SCRIPT |
       nsIAboutModule::HIDE_FROM_ABOUTABOUT },
     { "memory", "chrome://global/content/aboutMemory.xhtml",
       nsIAboutModule::ALLOW_SCRIPT },
     { "addons", "chrome://mozapps/content/extensions/extensions.xul",
       nsIAboutModule::ALLOW_SCRIPT },
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -59,74 +59,22 @@
         margin: 0;
       }
       
       .gnu-number {
         font-weight: bold;
       }
     </style>
     <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css">
-
-    <script type="text/javascript">
-    function correctSpelling()
-    {
-      // Note that this code only runs if the page is requested using the
-      // URL containing the correct spelling - i.e. "about:licence".
-      if (document.location.href.match("icence"))
-      {       
-        function acceptNode(node)
-        {
-          if (node.hasAttribute("class")) 
-          {
-            var c = " " + node.className + " ";
-            if (c.indexOf(" correctme ") != -1)
-            {
-              return NodeFilter.FILTER_ACCEPT;
-            }
-          }
-          else if (node.nodeName == "H1")
-          {
-            return NodeFilter.FILTER_ACCEPT;
-          }
-          
-          return NodeFilter.FILTER_SKIP;
-        }
-
-        var treeWalker = document.createTreeWalker(document.documentElement,
-                                                   NodeFilter.SHOW_ELEMENT,
-                                                   acceptNode,
-                                                   true);
-        if (treeWalker) 
-        {
-          var node = treeWalker.nextNode();
-          while (node) 
-          {
-            var text = node.innerHTML;
-
-            text = text.replace(/icense\b/gi, "icence");
-            text = text.replace(/icenses\b/gi, "icences");
-
-            node.innerHTML = text;
-          
-            node = treeWalker.nextNode();
-          }
-          
-          document.title = "about:licence";
-        }
-      }
-    }
-    
-    window.onload = correctSpelling;
-    </script>    
   </head>
 
   <body id="lic-info" class="aboutPageWideContainer">
-    <h1 class="correctme"><a name="top"></a>about:license</h1>
-
-    <div class="correctme">
+    <h1><a name="top"></a>about:license</h1>
+
+    <div>
 
 #ifdef APP_LICENSE_BLOCK
 #includesubst @APP_LICENSE_BLOCK@
 #endif
     
     <p>All of the <b>source code</b> to this product is 
        <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_%28Mercurial%29">available</a> 
        under licenses which are both 
@@ -1985,17 +1933,17 @@ necessary.  Here is a sample; alter the 
 
 <p>That's all there is to it!
 
 
     <hr>
 
     <h1><a name="angle"></a>ANGLE License</h1>
 
-    <p class="correctme">This license applies to files in the directory <span class="path">gfx/angle/</span>.</p>
+    <p>This license applies to files in the directory <span class="path">gfx/angle/</span>.</p>
     
 <pre>
 Copyright (C) 2002-2010 The ANGLE Project Authors. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -2027,17 +1975,17 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="apple"></a>Apple License</h1>
 
-    <p class="correctme">This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, and <span class="path">widget/src/cocoa</span>.</p>
+    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, and <span class="path">widget/src/cocoa</span>.</p>
     
 <pre>
 Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
@@ -2059,17 +2007,17 @@ OF LIABILITY, WHETHER IN CONTRACT, STRIC
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     
     <hr>
 
     <h1><a name="apple-mozilla"></a>Apple/Mozilla NPRuntime License</h1>
 
-    <p class="correctme">This license applies to the file 
+    <p>This license applies to the file
     <span class="path">modules/plugin/base/public/npruntime.h</span>.</p>
 
 <pre>
 Copyright &copy; 2004, Apple Computer, Inc. and The Mozilla Foundation. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -2098,17 +2046,17 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="apple-torch"></a>Apple/Torch Mobile License</h1>
 
-    <p class="correctme">This license applies to the following files:</p>
+    <p>This license applies to the following files:</p>
     
     <ul>
       <li class="path">js/src/assembler/wtf/Assertions.cpp</li>
       <li class="path">js/src/assembler/wtf/Platform.h</li>
     </ul>
     
 <pre>
 Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
@@ -2136,17 +2084,17 @@ OF LIABILITY, WHETHER IN CONTRACT, STRIC
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="breakpad"></a>Breakpad License</h1>
 
-    <p class="correctme">This license applies to files in the directory 
+    <p>This license applies to files in the directory
     <span class="path">toolkit/crashreporter/google-breakpad/</span> and
     <span class="path">camino/google-breakpad/</span>.</p>
 
 <pre>
 Copyright (c) 2006, Google Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -2176,17 +2124,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="bspatch"></a>bspatch License</h1>
 
-    <p class="correctme">This license applies to the files 
+    <p>This license applies to the files
     <span class="path">toolkit/mozapps/update/updater/bspatch.cpp</span> and
     <span class="path">toolkit/mozapps/update/updater/bspatch.h</span>.
     </p>
 
 <pre>
 Copyright 2003,2004 Colin Percival
 All rights reserved
 
@@ -2212,21 +2160,20 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWA
 POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="cairo"></a>Cairo Component Licenses</h1>
 
-    <p class="correctme">This license, with different copyright holders, applies 
-    to certain files in the directory
-    <span class="path">gfx/cairo/</span>. The copyright holders 
-    and the applicable ranges of dates are as follows:
-    
+    <p>This license, with different copyright holders, applies to certain files
+     in the directory <span class="path">gfx/cairo/</span>. The copyright
+     holders and the applicable ranges of dates are as follows:
+
     <ul>
 <li>2004 Richard D. Worth
 <li>2004, 2005 Red Hat, Inc.
 <li>2003 USC, Information Sciences Institute
 <li>2004 David Reveman
 <li>2005 Novell, Inc.
 <li>2004 David Reveman, Peter Nilsson
 <li>2000 Keith Packard, member of The XFree86 Project, Inc.
@@ -2265,17 +2212,17 @@ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARI
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="chromium"></a>Chromium License</h1>
 
-    <p class="correctme">This license applies to some files in the directories
+    <p>This license applies to some files in the directories
       <span class="path">ipc/chromium/</span>,
       <span class="path">dom/plugins/</span>,
       <span class="path">gfx/ots/</span> and
       <span class="path">gfx/ycbcr</span>.
     </p>
 
 <pre>
 Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
@@ -2307,17 +2254,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="hunspell-nl"></a>Dutch Spellchecking Dictionary License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
       <span class="path">l10n/nl/extensions/spellcheck/hunspell/</span>. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
 Copyright (c) 2006, 2007 OpenTaal
 Copyright (c) 2001, 2002, 2003, 2005 Simon Brouwer e.a.
 Copyright (c) 1996 Nederlandstalige Tex Gebruikersgroep
 
@@ -2350,17 +2297,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 </pre>
 
 
 
     <hr>
 
     <h1><a name="expat"></a>Expat License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory 
+    <p>This license applies to certain files in the directory
     <span class="path">parser/expat/</span>.</p>
 
 <pre>
 Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                and Clark Cooper
 Copyright (c) 2001, 2002, 2003 Expat maintainers.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -2384,17 +2331,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 </pre>
 
 
 
     <hr>
 
     <h1><a name="firebug"></a>Firebug License</h1>
 
-    <p class="correctme">This license applies to the code
+    <p>This license applies to the code
     <span class="path">toolkit/components/console/hudservice/NetworkHelper.jsm</span>.</p>
 
 <pre>
 Copyright (c) 2007, Parakey Inc.
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -2424,17 +2371,17 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADV
 </pre>
 
 
 
     <hr>
 
     <h1><a name="gfx-font-list"></a>gfxFontList License</h1>
 
-    <p class="correctme">This license applies to the files 
+    <p>This license applies to the files
     <span class="path">gfx/thebes/gfxMacPlatformFontList.mm</span> and
     <span class="path">gfx/thebes/gfxPlatformFontList.cpp</span>.
     </p>
 
 <pre>
 Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -2463,17 +2410,17 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 </pre>
 
 
 
     <hr>
 
     <h1><a name="gears"></a>Google Gears</h1>
 
-    <p class="correctme">This license applies to the file 
+    <p>This license applies to the file
     <span class="path">netwerk/wifi/wlanapi.h</span>.</p>
 
 <pre>
 Copyright 2008, Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
@@ -2500,17 +2447,17 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG
 
 
 
 
     <hr>
 
     <h1><a name="vp8"></a>Google VP8</h1>
 
-    <p class="correctme">This license applies to certain files in the directory 
+    <p>This license applies to certain files in the directory
     <span class="path">media/libvpx</span>.</p>
 <pre>
 Copyright (c) 2010, Google, Inc.
 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -2557,17 +2504,17 @@ infringement, or inducement of patent in
 granted to You under this License for this implementation of VP8
 shall terminate as of the date such litigation is filed.
 </pre>
 
     <hr>
 
     <h1><a name="gears-istumbler"></a>Google Gears/iStumbler</h1>
 
-    <p class="correctme">This license applies to the file 
+    <p>This license applies to the file
     <span class="path">netwerk/wifi/osx_wifi.h</span>.</p>
 
 <pre>
 Copyright 2008, Google Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
@@ -2626,17 +2573,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 </pre>
 
 
 
     <hr>
 
     <h1><a name="growl"></a>Growl License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
     <span class="path">toolkit/components/alerts/src/mac/growl/</span> and
     <span class="path">camino/growl/</span>. (This code only ships in the Mac
     OS X version of the product.)
 
 <pre>
 Copyright (c) The Growl Project, 2004-2009
 All rights reserved.
 
@@ -2666,17 +2613,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="halloc"></a>halloc</h1>
 
-    <p class="correctme">This license applies to certain files in the directory 
+    <p>This license applies to certain files in the directory
     <span class="path">media/libnestegg/src</span>.</p>
 <pre>
 Copyright (c) 2004-2010 Alex Pankratov. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright notice,
@@ -2699,19 +2646,18 @@ CAUSED AND ON ANY THEORY OF LIABILITY, W
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
     <h1><a name="harfbuzz"></a>HarfBuzz License</h1>
 
-    <p class="correctme">This license, with different copyright holders,
-    applies to the files in the directory
-    <span class="path">gfx/harfbuzz/</span>.
+    <p>This license, with different copyright holders, applies to the files in
+    the directory <span class="path">gfx/harfbuzz/</span>.
     The copyright holders and the applicable ranges of dates are as follows:</p>
 
     <ul>
         <li>1998-2004  David Turner and Werner Lemberg</li>
         <li>2004, 2007, 2008, 2009, 2010  Red Hat, Inc.</li>
         <li>2006  Behdad Esfahbod</li>
         <li>2007  Chris Wilson</li>
         <li>2009  Keith Stribley &lt;devel@thanlwinsoft.org&gt;</li>
@@ -2741,17 +2687,17 @@ FITNESS FOR A PARTICULAR PURPOSE.  THE S
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 </pre>
 
     <hr>
 
     <h1><a name="icu"></a>ICU License</h1>
 
-    <p class="correctme">This license applies to some code in the
+    <p>This license applies to some code in the
     <span class="path">gfx/thebes</span> directory.</p>
 
 <pre>
 ICU License - ICU 1.8.1 and later
 
 COPYRIGHT AND PERMISSION NOTICE
 
 Copyright (c) 1995-2009 International Business Machines Corporation and
@@ -2788,17 +2734,17 @@ All trademarks and registered trademarks
 of their respective owners. 
 </pre>
 
 
     <hr>
 
     <h1><a name="jpnic"></a>Japan Network Information Center License</h1>
 
-    <p class="correctme">This license applies to certain files in the 
+    <p>This license applies to certain files in the
     directory <span class="path">netwerk/dns/src/</span>.</p>
 
 <pre>
 Copyright (c) 2001,2002 Japan Network Information Center.
 All rights reserved.
  
 By using this file, you agree to the terms and conditions set forth below.
 
@@ -2838,17 +2784,17 @@ 5. Disclaimer/Limitation of Liability: T
    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 </pre>
 
     <hr>
 
     <h1><a name="jemalloc"></a>jemalloc License</h1>
 
-    <p class="correctme">This license applies to files in the directory
+    <p>This license applies to files in the directory
     <span class="path">memory/jemalloc/</span>.
     </p>
 
 <pre>
 Copyright (C) 2006-2008 Jason Evans &lt;jasone@FreeBSD.org&gt;.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -2875,17 +2821,17 @@ WHETHER IN CONTRACT, STRICT LIABILITY, O
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
     <h1><a name="jquery"></a>jQuery License</h1>
 
-    <p class="correctme">This license applies to files in the directory
+    <p>This license applies to files in the directory
       <span class="path">mail/jquery/</span>.<br>
       Furthermore, the file <span class="path">browser/base/content/tabview/iq.js</span>
       incorporates work from jQuery.</p>
 
 <pre>
 Copyright (c) 2010 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -2907,17 +2853,17 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
     <hr>
 
     <h1><a name="libevent"></a>libevent License</h1>
 
-    <p class="correctme">This license applies to files in the directory
+    <p>This license applies to files in the directory
     <span class="path">ipc/chromium/src/third_party/libevent/</span>.
     </p>
 
 <pre>
 Copyright 2000-2002 Niels Provos &lt;provos@citi.umich.edu&gt;
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -2943,17 +2889,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="libffi"></a>libffi License</h1>
 
-    <p class="correctme">This license applies to files in the directory
+    <p>This license applies to files in the directory
     <span class="path">js/ctypes/libffi/</span>.
     </p>
 
 <pre>
 libffi - Copyright (c) 1996-2008 Red Hat, Inc and others.  
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -2976,17 +2922,17 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF 
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="libnestegg"></a>libnestegg License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
     <span class="path">media/libnestegg</span>.
     </p>
 
 <pre>
 Copyright &copy; 2010 Mozilla Foundation
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -3000,17 +2946,17 @@ WHATSOEVER RESULTING FROM LOSS OF USE, D
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 </pre>
 
     <hr>
     
     <h1><a name="hunspell-lt"></a>Lithuanian Spellchecking Dictionary License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
       <span class="path">l10n/lt/extensions/spellcheck/hunspell/</span>. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
 The project has been sponsored by the Information Society Development
 Committee of the Government of Republic of Lithuania.
 
 
@@ -3043,17 +2989,17 @@ SUCH DAMAGE.
 </pre>
 
 
 
     <hr>
 
     <h1><a name="maattachedwindow"></a>MAAttachedWindow License</h1>
 
-    <p class="correctme">This license applies to the files 
+    <p>This license applies to the files
     <span class="path">camino/src/extensions/MAAttachedWindow.h</span> and
     <span class="path">camino/src/extensions/MAAttachedWindow.mm</span>. (This
     code only ships in the Camino browser or products based on it.)</p>
 
 <pre>
 		This software is supplied to you by Matt Gemmell in consideration of
 your agreement to the following terms, and your use, installation, modification
 or redistribution of this software constitutes acceptance of these terms. If
@@ -3092,17 +3038,17 @@ CONTRACT, TORT (INCLUDING NEGLIGENCE), S
 MATT GEMMELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="directx"></a>Microsoft DirectX License</h1>
 
-    <p class="correctme">This license applies to the following files;
+    <p>This license applies to the following files;
     they are referred to below as "Distributable Code":
     <span class="path">d3dx9_*.dll</span> and <span class="path">d3dcompiler_*.dll</span>.</p>
 
 <pre>
 Copyright (c) Microsoft Corporation.
 The Distributable Code may be used and distributed only if you comply with the
 following terms: (i) You may use, copy, and distribute the Distributable Code
 only as part of this product; (ii) You may not use the Distributable Code on a
@@ -3115,17 +3061,17 @@ allow you to use it in certain ways; and
 and international export laws and regulations that apply to the Distributable
 Code.
 </pre>
 
     <hr>
 
     <h1><a name="openvision"></a>OpenVision License</h1>
 
-    <p class="correctme">This license applies to the file 
+    <p>This license applies to the file
     <span class="path">extensions/auth/gssapi.h</span>.</p>
 
 <pre>
 Copyright 1993 by OpenVision Technologies, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software
 and its documentation for any purpose is hereby granted without fee,
 provided that the above copyright notice appears in all copies and
@@ -3145,17 +3091,17 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR
 PERFORMANCE OF THIS SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="qcms"></a>qcms License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
       <span class="path">gfx/qcms/</span>.</p>
 <pre>
 Copyright (C) 2009 Mozilla Corporation
 Copyright (C) 1998-2007 Marti Maria
 
 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, 
@@ -3175,17 +3121,17 @@ WHETHER IN AN ACTION OF CONTRACT, TORT O
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="xdg"></a>Red Hat xdg_user_dir_lookup License</h1>
 
-    <p class="correctme">This license applies to the 
+    <p>This license applies to the
     <span class="path">xdg_user_dir_lookup</span> function in
     <span class="path">xpcom/io/SpecialSystemDirectory.cpp</span>.</p>
     
 <pre>
 Copyright (c) 2007 Red Hat, Inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
@@ -3208,17 +3154,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="hunspell-ru"></a>Russian Spellchecking Dictionary License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
       <span class="path">l10n/ru/extensions/spellcheck/hunspell/</span>. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
 * Copyright (c) 1997-2008, Alexander I. Lebedev
 
 All rights reserved.
 
@@ -3248,17 +3194,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THI
 POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="sparkle"></a>Sparkle License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory
+    <p>This license applies to certain files in the directory
     <span class="path">camino/sparkle/</span>. (This code only ships in the
     Camino browser or products based on it.)</p>
 
 <pre>
 Copyright (c) 2006 Andy Matuschak
 
 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
@@ -3278,17 +3224,17 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERW
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 
     <hr>
 
     <h1><a name="sunsoft"></a>SunSoft License</h1>
 
-    <p class="correctme">This license applies to the
+    <p>This license applies to the
       <span class="path">ICC_H</span> block in
       <span class="path">gfx/qcms/qcms.h</span>.</p>
       
 <pre>
 Copyright (c) 1994-1996 SunSoft, Inc.
 
                     Rights Reserved
 
@@ -3318,17 +3264,17 @@ sale, use or other dealings in this Soft
 authorization from SunSoft Inc. 
 </pre>
 
 
     <hr>
 
     <h1><a name="ucal"></a>University of California License</h1>
 
-    <p class="correctme">This license applies to the following files or, in the case of 
+    <p>This license applies to the following files or, in the case of
     directories, certain files in those directories:</p>
     
     <ul>
       <li class="path">dbm/</li>
       <li class="path">db/mork/src/morkQuickSort.cpp</li>
       <li class="path">xpcom/glue/nsQuickSort.cpp</li>
       <li class="path">nsprpub/pr/src/misc/praton.c</li>
     </ul>
@@ -3365,17 +3311,17 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 SUCH DAMAGE.
 </pre>
 
     
     <hr>
 
     <h1><a name="ucambridge"></a>University of Cambridge License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory <span class="path">js/src/yarr/pcre/</span>.</p>
+    <p>This license applies to certain files in the directory <span class="path">js/src/yarr/pcre/</span>.</p>
 
 <pre>
 Copyright (c) 1997-2005 University of Cambridge. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright notice,
@@ -3402,17 +3348,17 @@ CONTRACT, STRICT LIABILITY, OR TORT (INC
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
     <h1><a name="uszeged"></a>University of Szeged License</h1>
 
-    <p class="correctme">This license applies to certain files in the directory <span class="path">js/src/assembler/assembler/</span>.</p>
+    <p>This license applies to certain files in the directory <span class="path">js/src/assembler/assembler/</span>.</p>
     
 <pre>
 Copyright (C) 2009 University of Szeged
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -3435,17 +3381,17 @@ OF LIABILITY, WHETHER IN CONTRACT, STRIC
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="hunspell-en-US"></a>US English Spellchecking Dictionary Licenses</h1>
 
-    <p class="correctme">These licenses apply to certain files in the directory
+    <p>These licenses apply to certain files in the directory
       <span class="path">extensions/spellcheck/locales/en-US/hunspell/</span>. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
 Different parts of the US English dictionary (SCOWL) are subject to the following licenses as 
 shown below. For additional details, sources, credits, and public domain references, see 
 <a href="http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/README.txt?raw=1">README.txt</a>.
 
@@ -3528,17 +3474,17 @@ Additional Contributors:
 </pre>
 
 
 
     <hr>
 
     <h1><a name="v8"></a>V8</h1>
 
-    <p class="correctme">This license applies to certain files in the directory 
+    <p>This license applies to certain files in the directory
     <span class="path">js/src/v8-dtoa</span>.</p>
 <pre>
 Copyright 2006-2008 the V8 project authors. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
     * Redistributions of source code must retain the above copyright
@@ -3564,17 +3510,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
     <h1><a name="xiph"></a>Xiph.org Foundation License</h1>
 
-    <p class="correctme">This license applies to files in the following directories 
+    <p>This license applies to files in the following directories
       with the specified copyright year ranges:</p>
     <ul>
       <li><span class="path">media/libogg/</span>, 2002</li>
       <li><span class="path">media/libtheora/</span>, 2002-2007</li>
       <li><span class="path">media/libvorbis/</span>, 2002-2004</li>
       <li><span class="path">media/libtremor/</span>, 2002-2010</li>
     </ul>
 
@@ -3623,18 +3569,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
           All rights reserved.</li>
     </ul>
 
 
     <hr>
 
     <h1><a name="optional-notices"></a>Optional Notices</h1>
 
-    <p class="correctme">Some permissive software licenses 
-    request but do not require an 
+    <p>Some permissive software licenses request but do not require an
     acknowledgement of the use of their software. We are very grateful
     to the following people and projects for their contributions to
     this product:</p>
     
     <ul>
       <li>The <a href="http://www.zlib.net/">zlib</a> compression library
           (Jean-loup Gailly, Mark Adler and team)</li>
       <li>The <a href="http://www.bzip.org/">bzip2</a> compression library
@@ -3645,13 +3590,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
           (D. Richard Hipp and team)</li>
       <li>The <a href="http://nsis.sourceforge.net/">Nullsoft Scriptable Install System</a>
           (Amir Szekely and team)</li>
     </ul>
     
     
     <hr>
     
-    <p class="correctme"><a href="about:license#top">Return to top</a>.</p>
+    <p><a href="about:license#top">Return to top</a>.</p>
     
   </body>
 </html>