Skip to content

Commit

Permalink
Updating the LICENSE to match the exact formatting of the canonical s…
Browse files Browse the repository at this point in the history
…ource. Also updated the README to provide clearer license attribution.

Signed-off-by: Ali Mukadam <[email protected]>
  • Loading branch information
hyder committed Nov 7, 2019
1 parent 8c9b5da commit d15d846
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 33 deletions.
35 changes: 35 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Copyright (c) 2019 Oracle and/or its affiliates.

The Universal Permissive License (UPL), Version 1.0

Subject to the condition set forth below, permission is hereby granted to any
person obtaining a copy of this software, associated documentation and/or data
(collectively the "Software"), free of charge and under any and all copyright
rights in the Software, and any and all patent rights owned or freely
licensable by each licensor hereunder covering either (i) the unmodified
Software as contributed to or provided by such licensor, or (ii) the Larger
Works (as defined below), to deal in both

(a) the Software, and
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
one is included with the Software (each a "Larger Work" to which the Software
is contributed by such licensors),

without restriction, including without limitation the rights to copy, create
derivative works of, display, perform, and distribute the Software and make,
use, sell, offer for sale, import, export, have made, and have sold the
Software and the Larger Work(s), and to sublicense the foregoing rights on
either these or other terms.

This license is subject to the following condition:
The above copyright notice and either this complete permission notice or at
a minimum a reference to the UPL must be included in all copies or
substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
27 changes: 0 additions & 27 deletions LICENSE.txt

This file was deleted.

17 changes: 11 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
:uri-contributors: {uri-rel-file-base}/CONTRIBUTORS.adoc

:uri-instructions: {uri-docs}/instructions.adoc
:uri-license: {uri-rel-file-base}/LICENSE.txt
:uri-license: {uri-rel-file-base}/LICENSE
:uri-canonical-license: https://oss.oracle.com/licenses/upl/
:uri-kubernetes: https://kubernetes.io/
:uri-networks-subnets-cidr: https://erikberg.com/notes/networks.html
:uri-oci: https://cloud.oracle.com/cloud-infrastructure
Expand Down Expand Up @@ -61,10 +62,6 @@ This {uri-repo}[Terraform OKE Installer] for {uri-oci}[Oracle Cloud Infrastructu
* {uri-networks-subnets-cidr}[Erik Berg on Networks, Subnets and CIDR]
* {uri-terraform-cidrsubnet-deconstructed}[Lisa Hagemann on Terraform cidrsubnet Deconstructed]
== License
{uri-license}[LICENSE.txt]
== Changelog
View the {uri-changelog}[CHANGELOG].
Expand All @@ -77,4 +74,12 @@ Code derived and adapted from {uri-terraform-oke-sample}[Terraform OKE Sample] a
{uri-contributors}[Folks who contributed with explanations, code, feedback, ideas, testing etc.]
Learn how to {uri-contribute}[contribute].
Learn how to {uri-contribute}[contribute].
== License
Copyright &copy; 2019 Oracle and/or its associates. All rights reserved.
Licensed under the {uri-license}[Universal Permissive License 1.0] as shown at
{uri-canonical-license}[https://oss.oracle.com/licenses/upl].

0 comments on commit d15d846

Please sign in to comment.