Bug 464994. about:license and about:rights potentially contradict each other. r=gerv, a=blocking-firefox3.1
authorJustin Dolske <dolske@mozilla.com>
Wed, 26 Nov 2008 20:59:47 -0500
changeset 21976 32213f0701efc3413530d52aee569bc7e493e55f
parent 21975 beb23427d11aa1cd175556e8f396c41c047b432c
child 21977 2e30d8025fa4f74d1100744707a3a4f1ee28ae44
push id3766
push userbzbarsky@mozilla.com
push dateThu, 27 Nov 2008 02:00:05 +0000
treeherdermozilla-central@070e364189c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv, blocking-firefox3.1
bugs464994
milestone1.9.1b3pre
Bug 464994. about:license and about:rights potentially contradict each other. r=gerv, a=blocking-firefox3.1
browser/base/Makefile.in
browser/base/content/overrides/app-license.html
toolkit/content/license.html
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -51,17 +51,17 @@ CHROME_DEPS += $(abs_srcdir)/content/ove
 ifdef ENABLE_TESTS
 DIRS += content/test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-	-DAPP_EULA_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+	-DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
 	$(NULL)
 
 ifndef MOZ_BRANDING_DIRECTORY
 DEFINES += -DMOZ_USE_GENERIC_BRANDING
 endif
 
 ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
--- a/browser/base/content/overrides/app-license.html
+++ b/browser/base/content/overrides/app-license.html
@@ -1,5 +1,3 @@
-    <p>Official <b>binaries</b> of this product released by the 
-    <a href="http://www.mozilla.com/">Mozilla Corporation</a> 
-    are made available under 
-    <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
-    EULA</a>.</p>
+    <p><b>Binaries</b> of this product have been made available to you by the
+    <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
+    Public License. <a href="about:rights">Know your rights</a>.</p>
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -118,24 +118,22 @@
     </script>    
   </head>
 
   <body id="lic-info" class="aboutPageWideContainer">
     <h1 class="correctme"><a name="top"></a>about:license</h1>
 
     <div class="correctme">
 
-#ifdef APP_EULA_BLOCK
-#includesubst @APP_EULA_BLOCK@
+#ifdef APP_LICENSE_BLOCK
+#includesubst @APP_LICENSE_BLOCK@
 #endif
     
-    <p>Except as described
-       <a id="exceptions-link" href="about:license#exceptions">here</a>, all 
-       of the <b>source code</b> to this product is 
-       <a href="http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS">available</a> 
+    <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 
        <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and 
        <a href="http://www.opensource.org/docs/definition.php">open source</a>.
        Most is available under any one of the following:
        the Mozilla Public License (MPL), the GNU General Public 
        License (GPL) and the GNU Lesser General Public License (LGPL).
        That is, you may copy and distribute such software according to the 
        terms of any one of those three licenses.
@@ -2720,31 +2718,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
           (Glenn Randers-Pehrson and team)</li>
       <li>The <a href="http://www.sqlite.org/">sqlite</a> database engine
           (D. Richard Hipp and team)</li>
     </ul>
     
     
     <hr>
     
-    <h3><a name="exceptions"></a>* Exceptions</h3>
-    
-    <p class="correctme">
-    Depending on how it was compiled, your product distribution and version 
-    may include the following portions which are not available under the 
-    above terms:
-    </p>
-    
-    <ul>
-      <li>Image files containing the 
-          <a href="http://www.mozilla.org/foundation/trademarks/policy.html">trademarks 
-          and logos</a> of the Mozilla
-          Foundation, which may not be reproduced without permission. 
-          (Copyright &copy;2004-2008 The Mozilla Foundation. 
-          All Rights Reserved. Some trademark rights are used under 
-          license from The Charlton Company.)
-    </ul>  
-    
     <p class="correctme"><a href="about:license#top">Return to top</a>.</p>
     
   </body>
 </html>