(no commit message)

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 0e18b4daac289a0f67a2f05fbc467e81797a9e3d..14161b8ca28ff1f110d95e38e2fecf69156952ed 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,4 +1,11 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+[[!meta title="Free Software"]]
 
-The parts of ikiwiki that become part of your own wiki (the basewiki pages
-and the [[templates]]) are licensed using a form of the [[BSD]] license.
+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: [online bug tracking](http://www.bontq.com)
+
+> Redistribution and use in source and compiled forms, with or without
+> modification, are permitted under any circumstances. No warranty.