Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike@mikegerwitz.com>2013-06-16 20:35:22 -0400
committerMike Gerwitz <mike@mikegerwitz.com>2013-06-16 20:35:22 -0400
commit6b6c5a1b5144c940b9bc0c60e22c590c898a2ade (patch)
tree0b6ab4a5407ead75e0ee8262e8bb3406c223bac8 /COPYING
parentc336800ca4288ce174f183de20cd1fdef2b37141 (diff)
downloadthoughts-6b6c5a1b5144c940b9bc0c60e22c590c898a2ade.tar.gz
thoughts-6b6c5a1b5144c940b9bc0c60e22c590c898a2ade.tar.bz2
thoughts-6b6c5a1b5144c940b9bc0c60e22c590c898a2ade.zip
All creative content (e.g. thoughts) now licensed under CC BY-SA
Added COPYING.{GPLv3,CCBYSA}, adjusted copyright for pages generated with repo2html and added CC BY-SA image to footer.
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING22
1 files changed, 17 insertions, 5 deletions
diff --git a/COPYING b/COPYING
index 30e0f80..ae6aacf 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,18 @@
-Verbatim distribution of any content, in its entirety, is permitted so long as
-its copyright notice is preserved. The license of any specific content
-supersedes this notice.
+Creative content, such as thoughts and writings, are licensed under the
+Creative Commons Attribution-ShareAlike license (CC BY-SA); a copy of this
+license is contained within the file COPYING.CCBYSA. Scripts and other
+software are licensed under the GNU General Public License version 3 or, at
+your option, any later version; a copy of this license is located within the
+file COPYING.GPLv3.
-If the content is distributed in its source form (which does not contain the
-copyright notice), this notice must accompany it.
+The license on any document supersedes this notice. Furthermore, the
+existence of a COPYING file in any directory shall supersede this notice for
+any documents within that directory and all subdirectories.
+
+The license for the commit messages---also known in this repository as
+``thoughts''---shall be considered, for the purposes of licensing, creative
+content; the license may be found under the COPYING tag, which may be viewed
+with the following command, so long as you have acquired the repository
+itself (as opposed to an archive of the source tree):
+
+ $ git cat-file blob COPYING