web commit by http://ethan.betacantrips.com/: Much simpler patch

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

diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 3d1fc408c9013cbbf4d60098cf4b3e0dcb1fd264..717ff6ebd4efa2ba9ed8ec18c378737b136e3157 100644 (file)
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -3,8 +3,8 @@
 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]]
 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 (but not the smilies) and the [[templates|wikitemplates]], but not
-the smiley icons) are licensed as follows: 
+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.
 
 > Redistribution and use in source and compiled forms, with or without
 > modification, are permitted under any circumstances. No warranty.