This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 061c1a244 site(attributions): relocate third-party cpy & tm notices
(#1271)
061c1a244 is described below
commit 061c1a2447e02cdd3d136b8fe1dc87509eea3861
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Wed Nov 2 00:16:32 2022 +0900
site(attributions): relocate third-party cpy & tm notices (#1271)
---
www/_includes/footer_contents.html | 10 +---------
www/attributions.html | 35 +++++++++++++++++++++++++++++++----
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/www/_includes/footer_contents.html
b/www/_includes/footer_contents.html
index 7e2357195..74f052b2d 100644
--- a/www/_includes/footer_contents.html
+++ b/www/_includes/footer_contents.html
@@ -66,13 +66,5 @@
Copyright © {{ 'now' | date: "%Y" }} The Apache Software Foundation,
Licensed under the <a target="_blank"
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version
2.0</a>.<br/>
Apache and the Apache feather logos are <a target="_blank"
href="https://www.apache.org/foundation/marks/list/";>trademarks</a> of The
Apache Software Foundation.
<br/>
- Apple, iPhone, macOS, OS X are trademarks of Apple Inc., registered in the
U.S. and other countries and regions.
- <br/>
- The Android robot is reproduced or modified from work created and shared
by Google and used according to terms described in the Creative Commons 3.0
Attribution License.
- <br/>
- GITHUB ®, the GITHUB ® logo design, the INVERTOCAT logo design,
OCTOCAT ®, and the OCTOCAT ® logo design are trademarks of GitHub,
Inc., registered in the United States and other countries.
- <br/>
- npm is a registered trademark of npm, Inc.
- <br/>
- "Raleway" font used under license. For details see the <a href="{{
site.baseurl }}/attributions/">attributions page</a>.
+ <p>See the <a href="{{ site.baseurl }}/attributions/">attributions
page</a> for other copyright & trademark notices.</p>
</p>
diff --git a/www/attributions.html b/www/attributions.html
index b3335a872..143368799 100644
--- a/www/attributions.html
+++ b/www/attributions.html
@@ -6,12 +6,33 @@ permalink: /attributions/
<h1>Attributions</h1>
+<section>
+ <h2>Apple Inc.</h2>
+ <hr>
+ <p>Apple, iPhone, macOS, OS X are trademarks of Apple Inc., registered in
the U.S. and other countries and regions.</p>
+</section>
+
+<section>
+ <h2>GitHub, Inc.</h2>
+ <hr>
+ <p>GITHUB ®, the GITHUB ® logo design, the INVERTOCAT logo design,
OCTOCAT ®, and the OCTOCAT ® logo design are trademarks of GitHub,
Inc., registered in the United States and other countries.</p>
+</section>
+
+<section>
+ <h2>Google LLC</h2>
+ <hr>
+ <p>The Android robot is reproduced or modified from work created and
shared by Google and used according to terms described in the Creative Commons
3.0 Attribution License.</p>
+</section>
+
+<section>
+ <h2>npm, Inc.</h2>
+ <hr>
+ <p>npm is a registered trademark of npm, Inc.</p>
+</section>
+
<section>
<h2>
- Raleway Font -
- <a
href="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL";>
- SIL Open Font License, 1.1
- </a>
+ Raleway Font - <a
href="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL";>SIL
Open Font License, 1.1</a>
</h2>
<hr>
<p>
@@ -29,3 +50,9 @@ permalink: /attributions/
<br/>
</p>
</section>
+
+<section>
+ <h2>Twitter Inc.</h2>
+ <hr>
+ <p>TWITTER, TWEET, RETWEET and the Twitter Bird logo are trademarks of
Twitter Inc. or its affiliates.</p>
+</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
