Skip to content

Commit

Permalink
chore(licence): improve wording and update NOTICE.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
ffoodd committed Jun 23, 2020
1 parent d9bc92a commit 0e49721
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 36 deletions.
57 changes: 24 additions & 33 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


<version>1.0</version>
<id><![CDATA[Helvetica Neue LT W07 55 Roman]]></id>
<vendor>Monotype Imaging Inc.</vendor>
Expand All @@ -12,8 +10,8 @@
</license>
<copyright><![CDATA[Copyright © 2014 Monotype Imaging Inc. All rights reserved.]]></copyright>
<trademark><![CDATA[Neue Helvetica is a trademark of Monotype Imaging Inc. registered in the U.S. Patent and Trademark Office and may be registered in certain other jurisdictions.]]></trademark>
Orange Company had bought the right for used Helvetica onto digital applications.
Don't use and distribute Helvetica font family if you're not explicitly authorized by Monotype Imaging Inc
Orange has purchased the right to use Helvetica in its websites and mobile applications.
Don't use and distribute Helvetica font family if you're not explicitly authorized by Monotype Imaging Inc
Parts list under Monotype Imaging Inc Copyright
fonts/HelvNeue55_W1G.woff2
fonts/HelvNeue75_W1G.woff
Expand All @@ -30,9 +28,9 @@ Parts list under Orange SA Copyright
Copyright (C) 2016 - 2019 Orange SA All rights reserved

The following parts are proprietary information of Orange.
You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software
You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software
or displayed on this website (https://boosted.orange.com) and owned by Orange SA and its subsidiaries,
in whole or part of, in any medium, except as required for reasonable and customary use in describing the origin of the software
in whole or part of, in any medium, except as required for reasonable and customary use in describing the origin of the software
and reproducing the content of the NOTICE and DOCUMENTATION files.
Any use or displaying shall constitute an infringement under intellectual property laws of France and international conventions.

Expand All @@ -59,35 +57,28 @@ site/docs/**/assets/img/favicons/apple-touch-icon-180x180.png
site/docs/**/assets/img/favicons/apple-touch-icon-57x57.png
site/docs/**/assets/img/favicons/apple-touch-icon-60x60.png
site/docs/**/assets/img/favicons/apple-touch-icon-72x72.png
site/docs/**/assets/img/favicons/apple-touch-icon-76x76.png
site/docs/**/assets/brand/logo-rule-1a.png
site/docs/**/assets/img/favicons/apple-touch-icon-76x76.png
site/docs/**/assets/brand/orange-logo.png
site/docs/**/assets/brand/orange_logo.svg
site/docs/**/assets/brand/orange-social.png
site/docs/**/assets/brand/orange-social.svg
site/docs/**/assets/brand/logo-rule-3a.png
site/docs/**/assets/brand/logo-rule-4b.png
site/docs/**/examples/module-002-quick-links/img/icn_facebook_black.png
site/docs/**/examples/module-002-quick-links/img/icn_messaging_black.png
site/docs/**/examples/module-002-quick-links/img/icn_music_black.png
site/docs/**/examples/module-002-quick-links/img/icn_top_black.png
site/docs/**/examples/module-006-content-panel/img/adaptation.jpg
site/docs/**/examples/module-006-content-panel/img/connexion.jpg
site/docs/**/examples/module-006-content-panel/img/disponibilite.jpg
site/docs/**/examples/module-006-content-panel/img/simplicite.jpg
site/docs/**/examples/module-006-content-panel/img/vignette1.jpg
site/docs/**/examples/module-012-product-details/img/label_discount.png
site/docs/**/examples/module-012-product-details/img/picture_device_3.png
site/docs/**/examples/module-012-product-details/img/picture_klif1.png
site/docs/**/examples/module-012-product-details/img/stars_sprite.png
site/docs/**/examples/orange_brand_2015/images/discovery-frame.png
site/docs/**/examples/orange_brand_2015/images/discovery-popout.png
site/docs/**/examples/orange_brand_2015/images/offset_LARGE_118551_Parties_foncees_du_bleu_de_travail_en_jaune.jpg
site/docs/**/examples/orange_brand_2015/images/popular-services-2.png
site/docs/**/examples/orange_brand_2015/images/discovery-frame-carousel.png
site/docs/**/examples/orange_brand_2015/images/discovery-popout-2byslide.png
site/docs/**/examples/orange_brand_2015/images/offset_LARGE_123305_chemisier_jaune.jpg
site/docs/**/examples/orange_brand_2015/images/popular-services-3.png
site/docs/**/examples/orange_brand_2015/images/discovery-frame-carousel-whitetext.png
site/docs/**/examples/orange_brand_2015/images/Fun-frame_frame-carousel.png
site/docs/**/examples/orange_brand_2015/images/popular-services-1.png
site/docs/**/examples/orange_brand_2015/images/une-nouvelle-marque_grid-full-width.jpg
site/docs/**/essentials/quick-links/img/icn_facebook.svg
site/docs/**/essentials/quick-links/img/icn_messaging.svg
site/docs/**/essentials/quick-links/img/icn_music.svg
site/docs/**/essentials/quick-links/img/icn_top.svg
site/docs/**/essentials/content-panel/img/adaptation.svg
site/docs/**/essentials/content-panel/img/connexion.svg
site/docs/**/essentials/content-panel/img/disponibilite.svg
site/docs/**/essentials/content-panel/img/simplicite.svg
site/docs/**/essentials/product-details/img/picture_device_3.png
site/docs/**/essentials/product-details/img/picture_klif1.png
site/docs/**/essentials/product-details/img/stars_sprite.png
site/docs/**/examples/orange-homepage/images/discovery.svg
site/docs/**/examples/orange-homepage/images/popular-services-1.png
site/docs/**/examples/orange-homepage/images/popular-services-2.png
site/docs/**/examples/orange-homepage/images/popular-services-3.png
End of the parts list under Orange SA Copyright


2 changes: 1 addition & 1 deletion scss/orangeHelvetica.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// </license>
// <copyright>Copyright © 2014 Monotype Imaging Inc. All rights reserved.
// <trademark>Neue Helvetica is a trademark of Monotype Imaging Inc. registered in the U.S. Patent and Trademark Office and may be registered in certain other jurisdictions.
// Orange Company had bought the right for used Helvetica onto digital applications.
// Orange has purchased the right to use Helvetica in its websites and mobile applications.
// Don't use and distribute Helvetica font family if you're not explicitly authorized by Monotype Imaging Inc

// 1. To use local() Helvetica Neue:
Expand Down
2 changes: 1 addition & 1 deletion site/docs/4.5/getting-started/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Be sure to have your pages set up with the latest design and development standar
Neue Helvetica is a trademark of Monotype Imaging Inc. registered in the U.S.
Patent and Trademark Office and may be registered in certain other jurisdictions.
Copyright © 2014 Monotype Imaging Inc. All rights reserved.
Orange Company had bought the right for used Helvetica onto digital applications.
Orange has purchased the right to use Helvetica in its websites and mobile applications.
If you are not authorized to used it, don't include the orangeHelvetica.css.
See NOTICE.txt for more information.
-->
Expand Down
2 changes: 1 addition & 1 deletion site/docs/4.5/getting-started/rtl.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Also please ensure to add attribute `dir="rtl"` to your `<html>` tag.
Neue Helvetica is a trademark of Monotype Imaging Inc. registered in the U.S.
Patent and Trademark Office and may be registered in certain other jurisdictions.
Copyright © 2014 Monotype Imaging Inc. All rights reserved.
Orange Company had bought the right for used Helvetica onto digital applications.
Orange has purchased the right to use Helvetica in its websites and mobile applications.
If you are not authorized to used it, don't include the orangeHelvetica.css.
See NOTICE.txt for more information.
-->
Expand Down

0 comments on commit 0e49721

Please sign in to comment.