web commit by http://victormoral.myopenid.com/: initial announcement

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index bcbfe38dc47fd36668932e9cbc8e0332d04e2e1e..b9112eff8b3c2b19ed1b5a953898a16b59173111 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,9 @@
-ikiwiki is licensed under the terms of the GNU [GPL](GPL).
\ No newline at end of file
+[[meta title="Free Software"]]
+
+ikiwiki is 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]], but not
+the smiley icons) are licensed as follows: Redistribution and use in source
+and compiled forms, with or without modification, are permitted under any
+circumstances. No warranty.