summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING46
1 files changed, 8 insertions, 38 deletions
diff --git a/COPYING b/COPYING
index 31ff4c1..c25e73d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-POM - Parabola Official Multimedia (text data only), the official collections of multimedia files
+PMC - Parabola Multimedia Collections, the official collections of multimedia files
2009-2016 - Parabola project (https://www.parabola.nu)
------------------------------------------------------------------------------------------------------------------------------------------
@@ -34,36 +34,6 @@ a) The Free Art License as published by Copyleft Attitude;
b) The Creative Commons Attribution-ShareAlike 4.0 International License as published by Creative Commons;
either version 4.0, or (at your option) any later version
- (read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/")
-
-------------------------------------------------------------------------------------------------------------------------------------------
-
-The mutimedia files (in 'src/doc+gpl', 'src/fnt+gpl', 'src/img+gpl', 'src/snd+gpl' and 'src/vid+gpl');
-you can redistribute it and/or modify it under the terms of either:
-
-a) The Free Art License as published by Copyleft Attitude;
- either version 1.3, or (at your option) any later version
- (read "COPYING_FAL_V1_3 or "http://artlibre.org/licence/lal/en/"), or
-
-b) The Creative Commons Attribution-ShareAlike 4.0 International License as published by Creative Commons;
- either version 4.0, or (at your option) any later version
- (read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or
-
-c) The GNU General Public License as published by the Free Software Foundation;
- either version 2, or (at your option) any later version
- (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html")
-
-------------------------------------------------------------------------------------------------------------------------------------------
-
-The mutimedia files (in 'src/fnt+fdl');
-you can redistribute it and/or modify it under the terms of either:
-
-a) The Free Art License as published by Copyleft Attitude;
- either version 1.3, or (at your option) any later version
- (read "COPYING_FAL_V1_3 or "http://artlibre.org/licence/lal/en/"), or
-
-b) The Creative Commons Attribution-ShareAlike 4.0 International License as published by Creative Commons;
- either version 4.0, or (at your option) any later version
(read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or
c) The GNU Free Documentation License as published by the Free Software Foundation;
@@ -73,7 +43,7 @@ c) The GNU Free Documentation License as published by the Free Software Foundati
------------------------------------------------------------------------------------------------------------------------------------------
-The mutimedia files (in 'src/fnt+fdl+gpl' and 'src/img+fdl+gpl');
+The mutimedia files (in 'src/doc+gpl', 'src/fnt+gpl', 'src/img+gpl', 'src/snd+gpl' and 'src/vid+gpl');
you can redistribute it and/or modify it under the terms of either:
a) The Free Art License as published by Copyleft Attitude;
@@ -84,11 +54,11 @@ b) The Creative Commons Attribution-ShareAlike 4.0 International License as publ
either version 4.0, or (at your option) any later version
(read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or
-c) The GNU General Public License as published by the Free Software Foundation;
- either version 2, or (at your option) any later version
- (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html"), or
-
-d) The GNU Free Documentation License as published by the Free Software Foundation;
+c) The GNU Free Documentation License as published by the Free Software Foundation;
either version 1.3, or (at your option) any later version;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts
- (read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html")
+ (read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html"), or
+
+d) The GNU General Public License as published by the Free Software Foundation;
+ either version 2, or (at your option) any later version
+ (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html")