web commit by JoshTriplett: aggregation of student activity blogs, to encourage and...

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

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 5d231de58b3d25312a9c7a522e726e23534bf960..040890246a49b9e54823600737b1042c90d6ec71 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,8 @@
-ikiwiki is licensed under the terms of the GNU [[GPL]].
+[[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
+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.