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 | |
| parent | 79751cdaf2f8a5c1017a11fedef7421e0fecf212 (diff) | |
* 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')
| -rw-r--r-- | doc/BSD | 20 | ||||
| -rw-r--r-- | doc/freesoftware.mdwn | 6 |
2 files changed, 4 insertions, 22 deletions
diff --git a/doc/BSD b/doc/BSD deleted file mode 100644 index 1ba5f1188..000000000 --- a/doc/BSD +++ /dev/null @@ -1,20 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. 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. |