Adding information about the media2iki github project.

[git.ikiwiki.info.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 399bdebdafb9501bf33ff868f2def1b78f2a49a1..7ac1ac6b44e8663cd5d443db9d46a66c7fa7307d 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,6 +1,11 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]], version 2 or later.
+[[!meta title="Free Software"]]

 
 

-The parts of ikiwiki that become part of your own wiki (the basewiki pages
-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.
+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.