aboutsummaryrefslogtreecommitdiff
path: root/doc/freesoftware.mdwn
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-13 18:48:53 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-13 18:48:53 +0000
commite3bf03f2540712a57c1fc52fb2dc4008c7d26cd1 (patch)
treeb32df44c28d29bbd57a08d64d2c42bcf0cdc5675 /doc/freesoftware.mdwn
parentdd03d57678aa8f9f6c716e6cc19c6c3749837dfe (diff)
downloadikiwiki-e3bf03f2540712a57c1fc52fb2dc4008c7d26cd1.tar
ikiwiki-e3bf03f2540712a57c1fc52fb2dc4008c7d26cd1.tar.gz
note that smiley icons are not licensed under the same all-permissive terms
as the rest of basewiki
Diffstat (limited to 'doc/freesoftware.mdwn')
-rw-r--r--doc/freesoftware.mdwn9
1 files changed, 5 insertions, 4 deletions
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.