X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f738b155b1186c2c77bb23eea9aaffa3fe77a2c6..b3b5a019ab9949fec4904bb436219156a681d305:/doc/freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 38a191853..399bdebda 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,4 +1,6 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+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 [[template]]) are licensed using a form of the [[BSD]] license.
+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.