diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-08 21:19:21 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-08 21:19:21 +0000 |
| commit | 56f8e6344c4c05656e83a47c1f7883ecc7d9808e (patch) | |
| tree | 09db8d14cf752f1b3b5818103a657a2c524d13d6 /doc/freesoftware.mdwn | |
| parent | 79751cdaf2f8a5c1017a11fedef7421e0fecf212 (diff) | |
| download | ikiwiki-56f8e6344c4c05656e83a47c1f7883ecc7d9808e.tar ikiwiki-56f8e6344c4c05656e83a47c1f7883ecc7d9808e.tar.gz | |
* Drop the BSD license for the templates and basewiki, and just allow them
to be used as close to public domain as possible.
Diffstat (limited to 'doc/freesoftware.mdwn')
| -rw-r--r-- | doc/freesoftware.mdwn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 0e18b4daa..399bdebda 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -1,4 +1,6 @@ -ikiwiki is licensed under the terms of the GNU [[GPL]]. +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 using a form of the [[BSD]] license. +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. |