web commit by JoshTriplett

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 38a191853aaf69dfc5708bc836c0345c6ed0333b..399bdebdafb9501bf33ff868f2def1b78f2a49a1 100644 (file)
--- 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.