X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4fc43146b3058a92e97acd230df31ca77af3f16c..dcd209e90268e485245ae35da962d43cfd912d87:/doc/freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index fd6802f6c..040890246 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,8 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
\ No newline at end of file
+[[meta title="Free Software"]]
+
+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.