From: | "Ulrich Müller" <ulm@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] proj/eselect:master commit in: / |
Date: | Thu, 28 Nov 2019 13:41:18 |
Message-Id: | 1574948136.45930f33e4db86b44c03133a85dda7fd3c9b0196.ulm@gentoo |
1 | commit: 45930f33e4db86b44c03133a85dda7fd3c9b0196 |
2 | Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 | AuthorDate: Thu Nov 28 13:35:36 2019 +0000 |
4 | Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 | CommitDate: Thu Nov 28 13:35:36 2019 +0000 |
6 | URL: https://gitweb.gentoo.org/proj/eselect.git/commit/?id=45930f33 |
7 | |
8 | Update CC-BY-SA to version 4.0. |
9 | |
10 | Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 | |
12 | ChangeLog | 3 +++ |
13 | README | 6 +++--- |
14 | 2 files changed, 6 insertions(+), 3 deletions(-) |
15 | |
16 | diff --git a/ChangeLog b/ChangeLog |
17 | index 6292c9a..e9f1f8e 100644 |
18 | --- a/ChangeLog |
19 | +++ b/ChangeLog |
20 | @@ -1,5 +1,8 @@ |
21 | 2019-11-28 Ulrich Müller <ulm@g.o> |
22 | |
23 | + * README: Documentation is now dual-licensed under GPL-2+ or |
24 | + CC-BY-SA-4.0. Update URI of GPL-2 license text. |
25 | + |
26 | * modules/rc.eselect (show_script_status): Quote strings to |
27 | prevent globbing, bug 701382. |
28 | |
29 | |
30 | diff --git a/README b/README |
31 | index 1ef30e6..bfcb6f9 100644 |
32 | --- a/README |
33 | +++ b/README |
34 | @@ -20,10 +20,10 @@ version 2 or later`__. |
35 | |
36 | The documentation in the ``doc/`` directory is dual-licensed. It can |
37 | be distributed either under the above terms, or (at your option) under |
38 | -the `Creative Commons Attribution-ShareAlike 3.0 Unported License`__. |
39 | +the `Creative Commons Attribution-ShareAlike 4.0 International License`__. |
40 | |
41 | -__ http://www.gnu.org/licenses/gpl-2.0 |
42 | -__ http://creativecommons.org/licenses/by-sa/3.0/ |
43 | +__ https://www.gnu.org/licenses/old-licenses/gpl-2.0.html |
44 | +__ https://creativecommons.org/licenses/by-sa/4.0/ |
45 | |
46 | Style Notes |
47 | ----------- |