X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f738b155b1186c2c77bb23eea9aaffa3fe77a2c6..50408be042864b88904ed5d1b37339017c63e8f3:/doc/freesoftware.mdwn?ds=sidebyside

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 38a191853..96293c90e 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,4 +1,8 @@
-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
+and the [[templates]]) are licensed as follows: Redistribution and use in 
+source and compiled forms, with or without modification, are permitted under
+any circumstances. No warranty.