Merge branch 'master' into cvs

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

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 653c2fe822a22bb6f63c208c547d87e31643bb21..2243d9b1f02c0a1192c2dcf2e22a8ddb87b775b2 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -1,10 +1,10 @@
-[[meta title="Free Software"]]
+[[!meta title="Free Software"]]

 
 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]]
 
 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
+pages (but not the smilies) and the [[templates]]) are licensed

 as follows: 
 
 > Redistribution and use in source and compiled forms, with or without
 as follows: 
 
 > Redistribution and use in source and compiled forms, with or without