summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-02-25 17:49:49 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-02-25 17:49:49 -0500
commitabd62cd0d2dd0cb1a702fb518cb4c6b84b127bbb (patch)
treebf85988d3c7ba11f9339d88e675a6b534a473e9e
parent7b9972291ff24fec983e64e12404fc79ea252931 (diff)
downloadhtml5ks-abd62cd0d2dd0cb1a702fb518cb4c6b84b127bbb.tar.xz
html5ks-abd62cd0d2dd0cb1a702fb518cb4c6b84b127bbb.zip
resolve more licensing discrepancies, move to rst
-rw-r--r--LICENSE.rst (renamed from LICENSE)15
-rw-r--r--www/css/font/gentium.ttfbin362664 -> 0 bytes
-rw-r--r--www/css/font/playtime.ttfbin71220 -> 0 bytes
-rw-r--r--www/css/font/playtime_bold.ttfbin47916 -> 0 bytes
4 files changed, 8 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE.rst
index 9d9f1d9..8a9d73c 100644
--- a/LICENSE
+++ b/LICENSE.rst
@@ -1,7 +1,7 @@
© 2013 Alex Xu (Hello71)
-All Rights Reserved
+License GPLv3+: `GNU GPL version 3`_ or later <http://gnu.org/licenses/gpl.html> *except as noted below*
-The "Playtime With Hot Toddies" font is not licensed, but was found on Font Squirrel [0], and is also in the KS source.
+The "Playtime With Hot Toddies" font is not licensed, but was found on `Font Squirrel`_, and is also in the KS source, which is released as CC-BY-ND. We follow the legal opinion of Font Squirrel, as below:
> This font was found on the internet and did not come with a license. While we try to make sure that all the fonts on fontsquirrel.com are properly licensed for commercial use, there are many fonts that have either been abandoned by their authors or the authors distribute their fonts without an explicit license.
>
@@ -9,11 +9,12 @@ The "Playtime With Hot Toddies" font is not licensed, but was found on Font Squi
Ren'Py (unrpyc/renpy) is distributed under the MIT license, in unrpyc/renpy/LICENSE.txt.
-Git submodules are *not* included as part of the source, and are licensed separately. See their respective subdirectories for more information.
+Git submodules are not included as part of the source, and are licensed separately. See their respective subdirectories for more information.
-All other source code (i.e. mine) is licensed under the GPL 3.0 license [1].
+All other source code (i.e. mine) is licensed under the `GPLv3`_ license.
-unrpyc itself used to be under the MIT license, but I have relicensed it as GPL 3.0. Where this is not legal, the contents of that subdirectory are available under the MIT license; however, the rest of the source code remains under GPL 3.0.
+unrpyc itself used to be under the MIT license, but I have relicensed it as GPL 3.0. Where this is not legal, the contents of that subdirectory are available under the MIT license; however, the rest of the source code remains under GPL 3.0, unless otherwise noted above.
-[0] http://www.fontsquirrel.com/license/Playtime-With-Hot-Toddies
-[1] https://www.gnu.org/copyleft/gpl.html
+.. _Font Squirrel: http://www.fontsquirrel.com/license/Playtime-With-Hot-Toddies
+.. _GNU GPL version 3:
+.. _GPLv3: https://www.gnu.org/licenses/gpl.html
diff --git a/www/css/font/gentium.ttf b/www/css/font/gentium.ttf
deleted file mode 100644
index a8c1756..0000000
--- a/www/css/font/gentium.ttf
+++ /dev/null
Binary files differ
diff --git a/www/css/font/playtime.ttf b/www/css/font/playtime.ttf
deleted file mode 100644
index a36000a..0000000
--- a/www/css/font/playtime.ttf
+++ /dev/null
Binary files differ
diff --git a/www/css/font/playtime_bold.ttf b/www/css/font/playtime_bold.ttf
deleted file mode 100644
index e730c2b..0000000
--- a/www/css/font/playtime_bold.ttf
+++ /dev/null
Binary files differ