From 56f8e6344c4c05656e83a47c1f7883ecc7d9808e Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 8 Feb 2007 21:19:21 +0000 Subject: * Drop the BSD license for the templates and basewiki, and just allow them to be used as close to public domain as possible. --- doc/freesoftware.mdwn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc/freesoftware.mdwn') 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. -- cgit v1.2.3