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

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