Skip to content

Commit 8f6930e

Browse files
authored
Merge pull request travis-ci#3364 from travis-ci/michal-at-travisci-patch-licensing-info-fix
Update open_source_licence.md
2 parents 9b801b9 + e5c3783 commit 8f6930e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

_includes/enterprise_sidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h3>Travis CI Docs</h3>
8383
<section class="sidebar-notice">
8484
<p>This documentation site is open source.
8585
The <a href="https://github.com/travis-ci/docs-travis-ci-com">README in our Git repository</a> explains how to contribute.</p>
86-
<p>Travis CI relies on Open Source <a href="/user/open_source_licence/">licensing information</a>.</p>
86+
<p>Travis CI relies on Open Source <a href="/user/open_source_license/">licensing information</a>.</p>
8787
</section>
8888

8989
</div><!-- /#sidebar -->

_includes/sidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ <h3>Travis CI Enterprise</h3>
160160
<section class="sidebar-notice">
161161
<p>This documentation site is Open Source.
162162
The <a href="https://github.com/travis-ci/docs-travis-ci-com">README in our Git repository</a> explains how to contribute.</p>
163-
<p>Travis CI relies on Open Source <a href="/user/open_source_licence/">licensing information</a>.</p>
163+
<p>Travis CI relies on Open Source <a href="/user/open_source_license/">licensing information</a>.</p>
164164
</section>
165165

166166
</div><!-- /#sidebar -->

user/open_source_licence.md renamed to user/open_source_license.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
---
2-
title: EmberJS MIT License
2+
title: Licensing Information
33
layout: en
44

55
---
66

7+
Travis CI relies on multiple Open-Source modules and frameworks. The respective licensing information is available in Travis CI [public repositories](https://github.com/travis-ci). Travis CI public source code is usually licensed under the MIT License.
8+
9+
The Travis CI [web application](https://app.travis-ci.com), running in your browsers (which may satisfy 'distributing Software' according to the legal assessment), relies on the EmberJS framework. Particular EmberJS framework version used by Travis CI is licensed as follows:
10+
11+
# EmberJS MIT License
12+
713
Copyright (c) 2011 Yehuda Katz, Tom Dale, and Ember.js contributors.
814

915
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

0 commit comments

Comments
 (0)