X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4b36dee35a55b08d6d6f3bb3840220a4956f2540..71d1fb4326d59a1179578244da1ac6d91aedf79d:/doc/freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 5d231de58..717ff6ebd 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,10 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+[[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 (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.