aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--README6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6292c9a..e9f1f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2019-11-28 Ulrich Müller <ulm@gentoo.org>
+ * README: Documentation is now dual-licensed under GPL-2+ or
+ CC-BY-SA-4.0. Update URI of GPL-2 license text.
+
* modules/rc.eselect (show_script_status): Quote strings to
prevent globbing, bug 701382.
diff --git a/README b/README
index 1ef30e6..bfcb6f9 100644
--- a/README
+++ b/README
@@ -20,10 +20,10 @@ version 2 or later`__.
The documentation in the ``doc/`` directory is dual-licensed. It can
be distributed either under the above terms, or (at your option) under
-the `Creative Commons Attribution-ShareAlike 3.0 Unported License`__.
+the `Creative Commons Attribution-ShareAlike 4.0 International License`__.
-__ http://www.gnu.org/licenses/gpl-2.0
-__ http://creativecommons.org/licenses/by-sa/3.0/
+__ https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+__ https://creativecommons.org/licenses/by-sa/4.0/
Style Notes
-----------