Skip to content

Commit 23a7d33

Browse files
authored
Merge pull request #797 from spdx/jlovejoy-or-later-only
add explanatory text re: -only and -or-later
2 parents 53b608f + 07f1ff3 commit 23a7d33

12 files changed

+68
-18
lines changed

src/AGPL-3.0-only.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;</p>
2525
</standardLicenseHeader>
2626
<notes>
27-
This version was released: 19 November 2007
27+
This version was released: 19 November 2007. This license identifier refers to the choice
28+
to use the code under AGPL-3.0-only, as distinguished from use of code under AGPL-3.0-or-later
29+
(i.e., AGPL-3.0 or some later version). The license notice (as seen in the Standard License
30+
Header field below) states which of these applies to the code in the file. The example
31+
in the exhibit to the license shows the license notice for the "or later" approach.
2832
</notes>
2933
<text>
3034
<titleText>

src/AGPL-3.0-or-later.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
<crossRef>https://opensource.org/licenses/AGPL-3.0</crossRef>
88
</crossRefs>
99
<notes>
10-
This version was released: 19 November 2007
10+
This version was released: 19 November 2007. This license identifier refers to the
11+
choice to use code under AGPL-3.0-or-later (i.e., AGPL-3.0 or some later version),
12+
as distinguished from use of code under AGPL-3.0-only. The license notice (as seen
13+
in the Standard License Header field below) states which of these applies
14+
the code in the file. The example in the exhibit to the license shows the license
15+
notice for the "or later" approach.
1116
</notes>
1217
<text>
1318
<titleText>

src/GPL-1.0-only.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@
2525
</p>
2626
</standardLicenseHeader>
2727
<notes>
28-
This license was released: February 1989. This refers to when this GPL version
29-
1.0 only is being used (as opposed to "or later").
28+
This license was released: February 1989. This license identifier refers to the choice
29+
to use the code under GPL-1.0-only, as distinguished from use of code under GPL-1.0-or-later
30+
(i.e., GPL-1.0 or some later version). The license notice (as seen in the Standard License
31+
Header field below) states which of these applies to the code in the file. The example
32+
in the exhibit to the license shows the license notice for the "or later" approach.
33+
3034
</notes>
3135
<text>
3236
<titleText>

src/GPL-1.0-or-later.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
<crossRef>https://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
77
</crossRefs>
88
<notes>
9-
This license was released: February 1989. This license
10-
has been deprecated by its authors.
9+
This license was released: February 1989. This license identifier refers to the
10+
choice to use code under GPL-1.0-or-later (i.e., GPL-1.0 or some later version),
11+
as distinguished from use of code under GPL-1.0-only. The license notice (as seen
12+
in the Standard License Header field below) states which of these applies
13+
the code in the file. The example in the exhibit to the license shows the license
14+
notice for the "or later" approach.
1115
</notes>
1216
<text>
1317
<titleText>

src/GPL-2.0-only.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
</p>
2828
</standardLicenseHeader>
2929
<notes>
30-
This license was released: June 1991 This refers to when this
31-
GPL 2.0 only is being used (as opposed to GPLv2 or later).
30+
This license was released: June 1991. This license identifier refers to the choice
31+
to use the code under GPL-2.0-only, as distinguished from use of code under GPL-2.0-or-later
32+
(i.e., GPL-2.0 or some later version). The license notice (as seen in the Standard License
33+
Header field below) states which of these applies to the code in the file. The example
34+
in the exhibit to the license shows the license notice for the "or later" approach.
3235
</notes>
3336
<text>
3437
<titleText>

src/GPL-2.0-or-later.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
<crossRef>https://opensource.org/licenses/GPL-2.0</crossRef>
88
</crossRefs>
99
<notes>
10-
This license was released: June 1991
10+
This license was released: June 1991. This license identifier refers to the
11+
choice to use code under GPL-2.0-or-later (i.e., GPL-2.0 or some later version),
12+
as distinguished from use of code under GPL-2.0-only. The license notice (as seen
13+
in the Standard License Header field below) states which of these applies
14+
the code in the file. The example in the exhibit to the license shows the license
15+
notice for the "or later" approach.
1116
</notes>
1217
<text>
1318
<titleText>

src/GPL-3.0-only.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
</p>
2828
</standardLicenseHeader>
2929
<notes>
30-
This license was released: 29 June 2007 This refers to when
31-
this GPL 3.0 only is being used (as opposed to "or later).
30+
This license was released: 29 June 2007. This license identifier refers to the choice
31+
to use the code under GPL-3.0-only, as distinguished from use of code under GPL-3.0-or-later
32+
(i.e., GPL-3.0 or some later version). The license notice (as seen in the Standard License
33+
Header field below) states which of these applies to the code in the file. The example
34+
in the exhibit to the license shows the license notice for the "or later" approach.
3235
</notes>
3336
<text>
3437
<titleText>

src/GPL-3.0-or-later.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
<crossRef>https://opensource.org/licenses/GPL-3.0</crossRef>
88
</crossRefs>
99
<notes>
10-
This license was released: 29 June 2007
10+
This license was released: 29 June 2007. This license identifier refers to the
11+
choice to use code under GPL-3.0-or-later (i.e., GPL-3.0 or some later version),
12+
as distinguished from use of code under GPL-3.0-only. The license notice (as seen
13+
in the Standard License Header field below) states which of these applies
14+
the code in the file. The example in the exhibit to the license shows the license
15+
notice for the "or later" approach.
1116
</notes>
1217
<text>
1318
<titleText>

src/LGPL-2.0-only.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
</standardLicenseHeader>
2222
<notes>
2323
This license was released: June 1991. This license has
24-
been superseded by LGPL v2.1 This refers to when this
25-
LGPL 2.0 only is being used (as opposed to "or later).
24+
been superseded by LGPL-2.1. This license identifier refers to the
25+
choice to use the code under LGPL-2.0-only, as distinguished from use of
26+
code under LGPL-2.0-or-later (i.e., LGPL-2.0 or some later version). The
27+
license notice (as seen in the Standard License Header field below) states
28+
which of these applies to the code in the file. The example in the exhibit
29+
to the license shows the license notice for the "or later" approach.
2630
</notes>
2731
<text>
2832
<titleText>

src/LGPL-2.0-or-later.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
</crossRefs>
88
<notes>
99
This license was released: June 1991. This license has
10-
been superseded by LGPL v2.1
10+
been superseded by LGPL-2.1. This license identifier refers to the
11+
choice to use code under LGPL-2.0-or-later (i.e., LGPL-2.0 or some later version),
12+
as distinguished from use of code under LGPL-2.0-only. The license notice (as seen
13+
in the Standard License Header field below) states which of these applies
14+
the code in the file. The example in the exhibit to the license shows the license
15+
notice for the "or later" approach.
1116
</notes>
1217
<text>
1318
<titleText>

src/LGPL-2.1-only.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@
2626
</p>
2727
</standardLicenseHeader>
2828
<notes>
29-
This license was released: February 1999. This refers to when
30-
this LGPL 2.1 only is being used (as opposed to "or later).
29+
This license was released: February 1999. This license identifier refers to the choice
30+
to use the code under LGPL-2.1-only, as distinguished from use of code under LGPL-2.1-or-later
31+
(i.e., LGPL-2.1 or some later version). The license notice (as seen in the Standard License
32+
Header field below) states which of these applies to the code in the file. The example
33+
in the exhibit to the license shows the license notice for the "or later" approach.
3134
</notes>
3235
<text>
3336
<titleText>

src/LGPL-2.1-or-later.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
<crossRef>https://opensource.org/licenses/LGPL-2.1</crossRef>
88
</crossRefs>
99
<notes>
10-
This license was released: February 1999.
10+
This license was released: February 1999. This license identifier refers to the
11+
choice to use code under LGPL-2.1-or-later (i.e., LGPL-2.1 or some later version),
12+
as distinguished from use of code under LGPL-2.1-only. The license notice (as seen
13+
in the Standard License Header field below) states which of these applies
14+
the code in the file. The example in the exhibit to the license shows the license
15+
notice for the "or later" approach.
1116
</notes>
1217
<text>
1318
<titleText>

0 commit comments

Comments
 (0)