Ver código fonte

correct license

George Baugh 11 anos atrás
pai
commit
9ac1cb6b7e
2 arquivos alterados com 14 adições e 41 exclusões
  1. 14 24
      LICENSE
  2. 0 17
      license.txt

+ 14 - 24
LICENSE

@@ -1,27 +1,17 @@
-Copyright (c) 2014, teodesian
-All rights reserved.
+Copyright 2013 by Thomas A. and George S. Baugh
+The scripts/code/etc. that comprise tCMS are all released under the GPL.
+See https://gnu.org/licenses/gpl.html for details.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of 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.
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This projects also includes a version of Cortado (http://www.theora.org/cortado/)
+and audioplayer.js (http://wpaudioplayer.com/download/).
+For those two pieces of software, they are being used according to their licences,
+so for anything having to do with those, refer to their respective licenses.

+ 0 - 17
license.txt

@@ -1,17 +0,0 @@
-Copyright 2013 by Thomas A. and George S. Baugh
-The scripts/code/etc. that comprise tCMS are all released under the GPL.
-See https://gnu.org/licenses/gpl.html for details.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of 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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-This projects also includes a version of Cortado (http://www.theora.org/cortado/)
-and audioplayer.js (http://wpaudioplayer.com/download/).
-For those two pieces of software, they are being used according to their licences,
-so for anything having to do with those, refer to their respective licenses.