Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 464994 - "about:license and about:rights both contain similar text, potentially contradict each other" [p=dolske@mozilla.com (Justin Dolske) / reed@reedloden.com (Reed Loden) r=gerv a=ss]

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@256889 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com 2009-04-10 23:19:04 +00:00
parent e7be1a3242
commit d30e59d2b5
4 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/browser/base/Makefile.in
View File

@ -56,7 +56,7 @@ include $(topsrcdir)/config/rules.mk
DEFINES += \ DEFINES += \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ -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) $(NULL)
ifndef MOZ_BRANDING_DIRECTORY ifndef MOZ_BRANDING_DIRECTORY

8
mozilla/browser/base/content/overrides/app-license.html
View File

@ -1,5 +1,3 @@
<p>Official <b>binaries</b> of this product released by the <p><b>Binaries</b> of this product have been made available to you by the
<a href="http://www.mozilla.com/">Mozilla Corporation</a> <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
are made available under Public License. <a href="about:rights">Know your rights</a>.</p>
<a href="http://www.mozilla.org/foundation/EULA/">the corresponding
EULA</a>.</p>

2
mozilla/mail/app/Makefile.in
View File

@ -57,7 +57,7 @@ DEFINES += \
-DAB_CD=$(AB_CD) \ -DAB_CD=$(AB_CD) \
-DGRE_MILESTONE=$(GRE_MILESTONE) \ -DGRE_MILESTONE=$(GRE_MILESTONE) \
-DGRE_BUILDID=$(GRE_BUILDID) \ -DGRE_BUILDID=$(GRE_BUILDID) \
-DAPP_EULA_BLOCK=$(MAIL_APP_LICENSE_FILE) \ -DAPP_LICENSE_BLOCK=$(MAIL_APP_LICENSE_FILE) \
$(NULL) $(NULL)
DIRS = profile DIRS = profile

28
mozilla/toolkit/content/license.html
View File

@ -121,14 +121,12 @@
<div class="correctme"> <div class="correctme">
#ifdef APP_EULA_BLOCK #ifdef APP_LICENSE_BLOCK
#includesubst @APP_EULA_BLOCK@ #includesubst @APP_LICENSE_BLOCK@
#endif #endif
<p>Except as described <p>All of the <b>source code</b> to this product is
<a id="exceptions-link" href="about:license#exceptions">here</a>, all <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_%28CVS%29">available</a>
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>
under licenses which are both under licenses which are both
<a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and <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>. <a href="http://www.opensource.org/docs/definition.php">open source</a>.
@ -2631,24 +2629,6 @@ POSSIBILITY OF SUCH DAMAGE.
<hr> <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-2009 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> <p class="correctme"><a href="about:license#top">Return to top</a>.</p>
</body> </body>