Skip to content

Commit 22e8662

Browse files
authored
Merge pull request novalagung#199 from novalagung/update-license
update license
2 parents ac104d1 + b43e1c5 commit 22e8662

File tree

4 files changed

+41
-33
lines changed

4 files changed

+41
-33
lines changed

LICENSE

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Attribution-NonCommercial-ShareAlike 4.0 International
1+
Attribution-ShareAlike 4.0 International
22

33
=======================================================================
44

@@ -54,18 +54,18 @@ exhaustive, and do not form part of our licenses.
5454

5555
=======================================================================
5656

57-
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
58-
Public License
57+
Creative Commons Attribution-ShareAlike 4.0 International Public
58+
License
5959

6060
By exercising the Licensed Rights (defined below), You accept and agree
6161
to be bound by the terms and conditions of this Creative Commons
62-
Attribution-NonCommercial-ShareAlike 4.0 International Public License
63-
("Public License"). To the extent this Public License may be
64-
interpreted as a contract, You are granted the Licensed Rights in
65-
consideration of Your acceptance of these terms and conditions, and the
66-
Licensor grants You such rights in consideration of benefits the
67-
Licensor receives from making the Licensed Material available under
68-
these terms and conditions.
62+
Attribution-ShareAlike 4.0 International Public License ("Public
63+
License"). To the extent this Public License may be interpreted as a
64+
contract, You are granted the Licensed Rights in consideration of Your
65+
acceptance of these terms and conditions, and the Licensor grants You
66+
such rights in consideration of benefits the Licensor receives from
67+
making the Licensed Material available under these terms and
68+
conditions.
6969

7070

7171
Section 1 -- Definitions.
@@ -84,7 +84,7 @@ Section 1 -- Definitions.
8484
and Similar Rights in Your contributions to Adapted Material in
8585
accordance with the terms and conditions of this Public License.
8686

87-
c. BY-NC-SA Compatible License means a license listed at
87+
c. BY-SA Compatible License means a license listed at
8888
creativecommons.org/compatiblelicenses, approved by Creative
8989
Commons as essentially the equivalent of this Public License.
9090

@@ -108,7 +108,7 @@ Section 1 -- Definitions.
108108

109109
g. License Elements means the license attributes listed in the name
110110
of a Creative Commons Public License. The License Elements of this
111-
Public License are Attribution, NonCommercial, and ShareAlike.
111+
Public License are Attribution and ShareAlike.
112112

113113
h. Licensed Material means the artistic or literary work, database,
114114
or other material to which the Licensor applied this Public
@@ -122,29 +122,21 @@ Section 1 -- Definitions.
122122
j. Licensor means the individual(s) or entity(ies) granting rights
123123
under this Public License.
124124

125-
k. NonCommercial means not primarily intended for or directed towards
126-
commercial advantage or monetary compensation. For purposes of
127-
this Public License, the exchange of the Licensed Material for
128-
other material subject to Copyright and Similar Rights by digital
129-
file-sharing or similar means is NonCommercial provided there is
130-
no payment of monetary compensation in connection with the
131-
exchange.
132-
133-
l. Share means to provide material to the public by any means or
125+
k. Share means to provide material to the public by any means or
134126
process that requires permission under the Licensed Rights, such
135127
as reproduction, public display, public performance, distribution,
136128
dissemination, communication, or importation, and to make material
137129
available to the public including in ways that members of the
138130
public may access the material from a place and at a time
139131
individually chosen by them.
140132

141-
m. Sui Generis Database Rights means rights other than copyright
133+
l. Sui Generis Database Rights means rights other than copyright
142134
resulting from Directive 96/9/EC of the European Parliament and of
143135
the Council of 11 March 1996 on the legal protection of databases,
144136
as amended and/or succeeded, as well as other essentially
145137
equivalent rights anywhere in the world.
146138

147-
n. You means the individual or entity exercising the Licensed Rights
139+
m. You means the individual or entity exercising the Licensed Rights
148140
under this Public License. Your has a corresponding meaning.
149141

150142

@@ -158,10 +150,9 @@ Section 2 -- Scope.
158150
exercise the Licensed Rights in the Licensed Material to:
159151

160152
a. reproduce and Share the Licensed Material, in whole or
161-
in part, for NonCommercial purposes only; and
153+
in part; and
162154

163-
b. produce, reproduce, and Share Adapted Material for
164-
NonCommercial purposes only.
155+
b. produce, reproduce, and Share Adapted Material.
165156

166157
2. Exceptions and Limitations. For the avoidance of doubt, where
167158
Exceptions and Limitations apply to Your use, this Public
@@ -229,9 +220,7 @@ Section 2 -- Scope.
229220
Rights, whether directly or through a collecting society
230221
under any voluntary or waivable statutory or compulsory
231222
licensing scheme. In all other cases the Licensor expressly
232-
reserves any right to collect such royalties, including when
233-
the Licensed Material is used other than for NonCommercial
234-
purposes.
223+
reserves any right to collect such royalties.
235224

236225

237226
Section 3 -- License Conditions.
@@ -276,6 +265,7 @@ following conditions.
276265
reasonable to satisfy the conditions by providing a URI or
277266
hyperlink to a resource that includes the required
278267
information.
268+
279269
3. If requested by the Licensor, You must remove any of the
280270
information required by Section 3(a)(1)(A) to the extent
281271
reasonably practicable.
@@ -287,7 +277,7 @@ following conditions.
287277

288278
1. The Adapter's License You apply must be a Creative Commons
289279
license with the same License Elements, this version or
290-
later, or a BY-NC-SA Compatible License.
280+
later, or a BY-SA Compatible License.
291281

292282
2. You must include the text of, or the URI or hyperlink to, the
293283
Adapter's License You apply. You may satisfy this condition
@@ -307,8 +297,7 @@ apply to Your use of the Licensed Material:
307297

308298
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
309299
to extract, reuse, reproduce, and Share all or a substantial
310-
portion of the contents of the database for NonCommercial purposes
311-
only;
300+
portion of the contents of the database;
312301

313302
b. if You include all or a substantial portion of the database
314303
contents in a database in which You have Sui Generis Database
@@ -415,6 +404,7 @@ Section 8 -- Interpretation.
415404
that apply to the Licensor or You, including from the legal
416405
processes of any jurisdiction or authority.
417406

407+
418408
=======================================================================
419409

420410
Creative Commons is not a party to its public

LICENSE.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Lisensi dan Distribusi Konten
2+
3+
Ebook Dasar Pemrograman Go gratis untuk disebarluaskan secara bebas, dengan catatan sesuai dengan aturan lisensi [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0) yang kurang lebih sebagai berikut:
4+
5+
- Diperbolehkan menyebar, mencetak, dan menduplikasi material dalam konten ini ke siapapun.
6+
- Diperbolehkan memodifikasi, mengubah, atau membuat konten baru menggunakan material yang ada dalam ebook ini untuk keperluan komersil maupun tidak.
7+
8+
Dengan catatan:
9+
10+
- Harus ada credit sumber aslinya, yaitu **Dasar Pemrograman Golang** atau **novalagung**
11+
- Tidak mengubah lisensi aslinya, yaitu **CC BY-SA 4.0**
12+
- Tidak ditambahi *restrictions* baru
13+
14+
Lebih jelasnya silakan cek [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).
15+
16+
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnovalagung%2Fdasarpemrogramangolang.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnovalagung%2Fdasarpemrogramangolang?ref=badge_large)
17+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Ebook ini merupakan project open source, jadi teruntuk siapapun yang ingin berko
4949

5050
## Lisensi dan Status FOSSA
5151

52-
Ebook Dasar Pemrograman Go gratis untuk disebarluaskan secara bebas, selama tidak melanggar aturan lisensi [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0) untuk versi mulai dari 2.2019.11.27. Di versi terdahulu lisensi ebook yang dipergunakan adalah [GNU LGPL 2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html).
52+
Ebook Dasar Pemrograman Go gratis untuk disebarluaskan secara bebas, baik untuk komersil maupun tidak, dengan catatan harus disertakan credit sumber aslinya (yaitu **Dasar Pemrograman Golang** atau **novalagung**) dan tidak mengubah lisensi aslinya (yaitu **CC BY-SA 4.0**). Lebih detailnya silakan cek halaman [lisensi dan distribusi konten](https://dasarpemrogramangolang.novalagung.com/LICENSE.html).
5353

5454
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnovalagung%2Fdasarpemrogramangolang.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnovalagung%2Fdasarpemrogramangolang?ref=badge_large)
5555

SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* [Dasar Pemrograman Golang](README.md)
44
* [Baca/download e-book versi PDF](https://dasarpemrogramangolang.novalagung.com/dasarpemrogramangolang.pdf)
55
* [Author & Contributors](CONTRIBUTING.md)
6+
* [Lisensi dan Distribusi Konten](LICENSE.md)
67

78
<hr>
89

0 commit comments

Comments
 (0)