X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=doc%2Ffreesoftware.mdwn;h=2243d9b1f02c0a1192c2dcf2e22a8ddb87b775b2;hp=bcbfe38dc47fd36668932e9cbc8e0332d04e2e1e;hb=HEAD;hpb=263106272a43eec5a71796f854540a6309f42a67

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index bcbfe38dc..2243d9b1f 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]]) are licensed
+as follows: 
+
+> Redistribution and use in source and compiled forms, with or without
+> modification, are permitted under any circumstances. No warranty.