Skip to content

Commit d76de1e

Browse files
authored
Merge pull request #88 from hyder/fix-licence-reference
Updating the LICENSE to match the exact formatting of the canonical s…
2 parents 8c9b5da + d15d846 commit d76de1e

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

LICENSE

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
Copyright (c) 2019 Oracle and/or its affiliates.
2+
3+
The Universal Permissive License (UPL), Version 1.0
4+
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
12+
13+
(a) the Software, and
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
17+
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
23+
24+
This license is subject to the following condition:
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
28+
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.

LICENSE.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.adoc

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
:uri-contributors: {uri-rel-file-base}/CONTRIBUTORS.adoc
1818

1919
:uri-instructions: {uri-docs}/instructions.adoc
20-
:uri-license: {uri-rel-file-base}/LICENSE.txt
20+
:uri-license: {uri-rel-file-base}/LICENSE
21+
:uri-canonical-license: https://oss.oracle.com/licenses/upl/
2122
:uri-kubernetes: https://kubernetes.io/
2223
:uri-networks-subnets-cidr: https://erikberg.com/notes/networks.html
2324
:uri-oci: https://cloud.oracle.com/cloud-infrastructure
@@ -61,10 +62,6 @@ This {uri-repo}[Terraform OKE Installer] for {uri-oci}[Oracle Cloud Infrastructu
6162
* {uri-networks-subnets-cidr}[Erik Berg on Networks, Subnets and CIDR]
6263
* {uri-terraform-cidrsubnet-deconstructed}[Lisa Hagemann on Terraform cidrsubnet Deconstructed]
6364
64-
== License
65-
66-
{uri-license}[LICENSE.txt]
67-
6865
== Changelog
6966
7067
View the {uri-changelog}[CHANGELOG].
@@ -77,4 +74,12 @@ Code derived and adapted from {uri-terraform-oke-sample}[Terraform OKE Sample] a
7774
7875
{uri-contributors}[Folks who contributed with explanations, code, feedback, ideas, testing etc.]
7976
80-
Learn how to {uri-contribute}[contribute].
77+
Learn how to {uri-contribute}[contribute].
78+
79+
80+
== License
81+
82+
Copyright © 2019 Oracle and/or its associates. All rights reserved.
83+
84+
Licensed under the {uri-license}[Universal Permissive License 1.0] as shown at
85+
{uri-canonical-license}[https://oss.oracle.com/licenses/upl].

0 commit comments

Comments
 (0)