Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 717ff6ebd4efa2ba9ed8ec18c378737b136e3157..7ac1ac6b44e8663cd5d443db9d46a66c7fa7307d 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,6 +1,7 @@
-[[meta title="Free Software"]]
+[[!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 (but not the smilies) and the [[templates|wikitemplates]]) are licensed
 
 The parts of ikiwiki that become part of your own wiki (the [[basewiki]]
 pages (but not the smilies) and the [[templates|wikitemplates]]) are licensed