summaryrefslogtreecommitdiffstats
path: root/COPYING.md
diff options
context:
space:
mode:
authorAmin Bandali <bandali@gnu.org>2020-07-18 20:50:42 -0400
committerAmin Bandali <bandali@gnu.org>2020-07-18 20:50:42 -0400
commitdb1ba31e6db480409409042e78f8c49ee0c5e4fc (patch)
tree5f4e0a0edfcc4401f15ae8e603d843af40c9104c /COPYING.md
parentf76fb41c6ba826fcffcc9ef600767ab18dcdcf4c (diff)
downloademacsconf-wiki-db1ba31e6db480409409042e78f8c49ee0c5e4fc.tar.xz
emacsconf-wiki-db1ba31e6db480409409042e78f8c49ee0c5e4fc.zip
tweak wording
Diffstat (limited to 'COPYING.md')
-rw-r--r--COPYING.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/COPYING.md b/COPYING.md
index cac0b19..d09db62 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.