summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2009-01-13 13:00:45 +0000
committerCarsten Haitzler <raster@rasterman.com>2009-01-13 13:00:45 +0000
commit148b199424557ef776036e4cf92b11179c43c2ed (patch)
tree6726c2958cfe472182215fb141734392c3542cff /COPYING
parent78c70d7f94bbfe285ad51a38c7640864b0a4fd6c (diff)
fix the copying license to
1. get rid of grammar mistake 2. refer to COPYING-PLAIn correctly as the filename 3. be more explicit on "shipping source" due to ambiguity (this makes it what it was intended to be and that is GPL compatible). this does not modify the LGPL libs... or GPL apps etc. - only those using the original COPYING from e. author and dates at the top remain the same. SVN revision: 38569
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING22
1 files changed, 13 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index 474fcc5..9690c3f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,3 @@
1Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
2 1
3Permission is hereby granted, free of charge, to any person obtaining a copy 2Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to 3of this software and associated documentation files (the "Software"), to
@@ -10,15 +9,20 @@ furnished to do so, subject to the following conditions:
10The above copyright notice and this permission notice shall be included in 9The above copyright notice and this permission notice shall be included in
11all copies of the Software and its Copyright notices. In addition publicly 10all copies of the Software and its Copyright notices. In addition publicly
12documented acknowledgment must be given that this software has been used if no 11documented acknowledgment must be given that this software has been used if no
13source code of this software is made available publicly. This includes 12source code of this software is made available publicly. Making the source
14acknowledgments in either Copyright notices, Manuals, Publicity and Marketing 13available publicly means including the source for this software with the
15documents or any documentation provided with any product containing this 14distribution, or a method to get this software via some reasonable mechanism
16software. This License does not apply to any software that links to the 15(electronic transfer via a network or media) as well as making an offer to
17libraries provided by this software (statically or dynamically), but only to 16supply the source on request. This Copyright notice serves as an offer to
18the software provided. 17supply the source on on request as well. Instead of this, supplying
18acknowledgments of use of this software in either Copyright notices, Manuals,
19Publicity and Marketing documents or any documentation provided with any
20product containing this software. This License does not apply to any software
21that links to the libraries provided by this software (statically or
22dynamically), but only to the software provided.
19 23
20Please see the COPYING.PLAIN for a plain-english explanation of this notice 24Please see the COPYING-PLAIN for a plain-english explanation of this notice
21and it's intent. 25and its intent.
22 26
23THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 27THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 28IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,