merge helponformatting fix to basewiki

[ikiwiki.git] / doc / freesoftware.mdwn

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index bcbfe38dc47fd36668932e9cbc8e0332d04e2e1e..0e18b4daac289a0f67a2f05fbc467e81797a9e3d 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1 +1,4 @@
-ikiwiki is licensed under the terms of the GNU [GPL](GPL).
\ No newline at end of file
+ikiwiki is licensed under the terms of the GNU [[GPL]].
+
+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.