Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 2b3a0af0cc61aba03d62593689507acd28d49b78..653c2fe822a22bb6f63c208c547d87e31643bb21 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,8 +1,11 @@
 [[meta title="Free Software"]]
 
-ikiwiki is licensed under the terms of the GNU [[GPL]], version 2 or later.
+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
-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.
+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.