From: joey Date: Fri, 13 Apr 2007 18:48:53 +0000 (+0000) Subject: note that smiley icons are not licensed under the same all-permissive terms X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/e3bf03f2540712a57c1fc52fb2dc4008c7d26cd1 note that smiley icons are not licensed under the same all-permissive terms as the rest of basewiki --- diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 2b3a0af0c..b9112eff8 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -2,7 +2,8 @@ ikiwiki is licensed under the terms of the GNU [[GPL]], version 2 or later. -The parts of ikiwiki that become part of your own wiki (the [[basewiki]] pages -and the [[templates|wikitemplates]]) are licensed as follows: Redistribution and -use in source and compiled forms, with or without modification, are permitted under -any circumstances. No warranty. +The parts of ikiwiki that become part of your own wiki (the [[basewiki]] +pages (but not the smilies) and the [[templates|wikitemplates]], but not +the smiley icons) are licensed as follows: Redistribution and use in source +and compiled forms, with or without modification, are permitted under any +circumstances. No warranty.