X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Ffreesoftware.mdwn;h=2243d9b1f02c0a1192c2dcf2e22a8ddb87b775b2;hb=9dc1abc71e1a1181c924fe33500aa5b40d02bfaa;hp=5d231de58b3d25312a9c7a522e726e23534bf960;hpb=4b36dee35a55b08d6d6f3bb3840220a4956f2540;p=ikiwiki.git

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 5d231de58..2243d9b1f 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,11 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+[[!meta title="Free Software"]]
+
+ikiwiki, and this documentation wiki, are 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]]) are licensed
+as follows: 
+
+> Redistribution and use in source and compiled forms, with or without
+> modification, are permitted under any circumstances. No warranty.