summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--COPYING.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/COPYING.md b/COPYING.md
index cac0b19d..d09db622 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,8 +1,9 @@
Except where otherwise noted, the material on the EmacsConf wiki are
dual-licensed under the terms of the Creative Commons
-Attribution-ShareAlike 4.0 International; and the GNU General Public
-License as published by the Free Software Foundation, either version 3
-of the License, or (at your option) any later version.
+Attribution-ShareAlike 4.0 International Public License; and the GNU
+General Public License as published by the Free Software Foundation,
+either version 3 of the License, or (at your option) any later
+version.
Copies of these two licenses are included in the EmacsConf wiki
repository, in the [[COPYING.GPL]] and [[COPYING.CC-BY-SA]] files.