502831 - Updates to Mozilla Trademark Page

Status: VERIFIED FIXED

(www.mozilla.org :: General, defect)

Description

[Steven Garrity [:sgarrity]]

A few updates to the Trademark page (moving from email to a bug):

CC license language to be provided by Catherine.  This will go in as a footnote

Updated Firefox Logo (that's what happens when we lag)

Need to add the Creative Collective Logo

Need to add the Campus Reps Logo.

Text for Foxkeh logo:
This trademark is licensed under under the Creative Commons Attribution-Non-Commercial-NoDerivs 2.1 Japan."

Text for the Mozilla Community logo:
"See the separate licensing guidelines for this logo, located at https://wiki.mozilla.org/MCS:Licensing_Guidelines."

Comment 1

[Catherine C. Brady]

The first column, there shouldn't be ( ) around the R and TM symbols.

Comment 2

[Catherine C. Brady]

Bug 503637 is dependent on this one being completed. The updated trademark policy mentions this trademark list and we need the  URL for a hyperlink.

Maybe we can push this live and then add the Chinese logos when we get them?

Comment 3

[Stephen DesRoches]

New Firefox logo, G-Fox logo, Creative Collective logo, Campus Reps logo and the text for Foxkeh and Mozilla Community have been committed to trunk #29846

Comment 4

[Catherine C. Brady]

Thanks Stephen. Only changes I have is that the (R) symbol after both the Creative Collective and Campus Reps logos should be (TM).

Looks really good.

Comment 5

[Stephen DesRoches]

Catherine: Those two changes have been fixed.

Comment 6

[Steven Garrity [:sgarrity]]

Merged to stage in r29850. The following files can be pushed from stage->production:

M      img/trademarks/firefox-logo-r.png
A  +   img/trademarks/gfox-logo-r.png
A  +   img/trademarks/gfox-r.png
A  +   img/trademarks/creativecollective-logo.png
A  +   img/trademarks/campusreps-logo.png
M      en-US/about/trademarks/index.html
M      style/tignish/trademarks.css

Comment 7

[Tara (musingt)]

Pushed! http://www.mozilla.com/en-US/about/trademarks/
Thanks everyone.

Comment 8

[raymond [:retornam] (inactive)]

verified fixed on http://www.mozilla.com/en-US/about/trademarks/