X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/263106272a43eec5a71796f854540a6309f42a67..257cbbcb7e151053641bde409253a1ea792e9569:/doc/freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index bcbfe38dc..7ac1ac6b4 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,11 @@
-ikiwiki is licensed under the terms of the GNU [GPL](GPL).
\ No newline at end of file
+[[!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|wikitemplates]]) are licensed
+as follows: 
+
+> Redistribution and use in source and compiled forms, with or without
+> modification, are permitted under any circumstances. No warranty.