Clarified licensing for fonts to make it clear that they were binary files 
distributed under the SIL OFL.

(cherry picked from commit c72bbd82768c9043f40b286067248472250524b7)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/094cec56
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/094cec56
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/094cec56

Branch: refs/heads/1.8.x
Commit: 094cec561ec6f289d2ca5fd87e4f7d83076dd128
Parents: d79d3a6
Author: Chris Lemmons <alfic...@gmail.com>
Authored: Thu Feb 16 09:51:09 2017 -0700
Committer: Dan Kirkwood <dang...@gmail.com>
Committed: Thu Feb 16 10:20:26 2017 -0700

----------------------------------------------------------------------
 LICENSE | 5 ++---
 NOTICE  | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/094cec56/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 85466a8..63133b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,10 +230,10 @@ For the fontawesome component:
 @docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.*
 @traffic_ops/experimental/ui/app/src/assets/fonts/[Ff]ont[Aa]wesome*
 
-SIL License for fontawesome font:
+These binary fontawesome fonts are provided under the SIL Open Font License 
1.1:
 ./licenses/SIL-1.1
 
-MIT License for fontawesome css:
+The fontawesome CSS files are provided under an MIT license:
 ./licenses/MIT-fontawesome
 
 For the Inconsolata and Lato fonts:
@@ -241,7 +241,6 @@ For the Inconsolata and Lato fonts:
 @docs/source/_themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf
 @docs/source/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
 @docs/source/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
-
 ./licenses/SIL-1.1
 
 For the bootstrap component:

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/094cec56/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f86e3e1..7e3c6c1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,3 +12,10 @@ Cisco Systems, Inc. (http://www.cisco.com)
 
 This product includes GeoLite2 data created by MaxMind, available from
 <a href="http://www.maxmind.com";>http://www.maxmind.com</a>.
+
+These binary fonts are provided under the SIL Open Font License 1.1 (see 
LICENSE and licenses/SIL-1.1 for details):
+  - FontAwesome          (http://fontawesome.io/license/)
+  - Inconsolata-Bold.ttf 
(https://github.com/google/fonts/blob/master/ofl/inconsolata/OFL.txt)
+  - Inconsolata.ttf      
(https://github.com/google/fonts/blob/master/ofl/inconsolata/OFL.txt)
+  - Lato-Bold.ttf        
(https://github.com/google/fonts/blob/master/ofl/lato/OFL.txt)
+  - Lato-Regular.ttf     
(https://github.com/google/fonts/blob/master/ofl/lato/OFL.txt)

Reply via email to