web commit by http://ccshan.myopenid.com/

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 38a191853aaf69dfc5708bc836c0345c6ed0333b..b9112eff8b3c2b19ed1b5a953898a16b59173111 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,4 +1,9 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+[[meta title="Free Software"]]
 
-The parts of ikiwiki that become part of your own wiki (the basewiki pages
-and the [[template]]) are licensed using a form of the [[BSD]] license.
+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 (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.