Skip to content

Commit 8f71afc

Browse files
committed
remove dead/invalid links from mit copyright. Indent licenses
Also move note that http://www.zope.com/Marks is dead. Hopefully this will make the license scans on github pass.
1 parent c409909 commit 8f71afc

File tree

1 file changed

+78
-78
lines changed

1 file changed

+78
-78
lines changed

COPYING.txt

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1-
Note links for http://www.zope.com/Marks and http://www.ekit.com/ are dead.
2-
31
Roundup, exclusive of the Zope page templates, is `MIT licensed`_.
42

53
.. _MIT licensed: https://opensource.org/license/mit/
64

75
Roundup Licensing
86
-----------------
97

10-
Copyright (c) 2009-2022 Roundup-Team (https://opensource.org/license/mit/)
11-
Copyright (c) 2003-2009 Richard Jones ([email protected])
12-
Copyright (c) 2002 eKit.com Inc (http://www.ekit.com/)
13-
Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
8+
Copyright (c) 2009-2022 Roundup-Team (https://opensource.org/license/mit/)
9+
Copyright (c) 2003-2009 Richard Jones ([email protected])
10+
Copyright (c) 2002 eKit.com Inc
11+
Copyright (c) 2001 Bizar Software Pty Ltd
1412

15-
Permission is hereby granted, free of charge, to any person obtaining a copy
16-
of this software and associated documentation files (the "Software"), to deal
17-
in the Software without restriction, including without limitation the rights
18-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
19-
copies of the Software, and to permit persons to whom the Software is
20-
furnished to do so, subject to the following conditions:
13+
Permission is hereby granted, free of charge, to any person obtaining a copy
14+
of this software and associated documentation files (the "Software"), to deal
15+
in the Software without restriction, including without limitation the rights
16+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
17+
copies of the Software, and to permit persons to whom the Software is
18+
furnished to do so, subject to the following conditions:
2119

22-
The above copyright notice and this permission notice shall be included in
23-
all copies or substantial portions of the Software.
20+
The above copyright notice and this permission notice shall be included in
21+
all copies or substantial portions of the Software.
2422

25-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
26-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
27-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
28-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
29-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
30-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31-
SOFTWARE.
23+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
24+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
26+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
28+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
29+
SOFTWARE.
3230

3331

3432
PageTemplates Licensing
@@ -56,60 +54,62 @@ included below.
5654
Zope Public License (ZPL) Version 2.0
5755
-------------------------------------
5856

59-
This software is Copyright (c) Zope Corporation (tm) and
60-
Contributors. All rights reserved.
61-
62-
This license has been certified as open source. It has also
63-
been designated as GPL compatible by the Free Software
64-
Foundation (FSF).
65-
66-
Redistribution and use in source and binary forms, with or
67-
without modification, are permitted provided that the
68-
following conditions are met:
69-
70-
1. Redistributions in source code must retain the above
71-
copyright notice, this list of conditions, and the following
72-
disclaimer.
73-
74-
2. Redistributions in binary form must reproduce the above
75-
copyright notice, this list of conditions, and the following
76-
disclaimer in the documentation and/or other materials
77-
provided with the distribution.
78-
79-
3. The name Zope Corporation (tm) must not be used to
80-
endorse or promote products derived from this software
81-
without prior written permission from Zope Corporation.
82-
83-
4. The right to distribute this software or to use it for
84-
any purpose does not give you the right to use Servicemarks
85-
(sm) or Trademarks (tm) of Zope Corporation. Use of them is
86-
covered in a separate agreement (see
87-
http://www.zope.com/Marks).
88-
89-
5. If any files are modified, you must cause the modified
90-
files to carry prominent notices stating that you changed
91-
the files and the date of any change.
92-
93-
Disclaimer
94-
95-
THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ''AS IS''
96-
AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
97-
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
98-
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
99-
NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
100-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
101-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
102-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
103-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
104-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
105-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
106-
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
107-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
108-
DAMAGE.
109-
110-
111-
This software consists of contributions made by Zope
112-
Corporation and many individuals on behalf of Zope
113-
Corporation. Specific attributions are listed in the
114-
accompanying credits file.
115-
57+
This software is Copyright (c) Zope Corporation (tm) and
58+
Contributors. All rights reserved.
59+
60+
This license has been certified as open source. It has also
61+
been designated as GPL compatible by the Free Software
62+
Foundation (FSF).
63+
64+
Redistribution and use in source and binary forms, with or
65+
without modification, are permitted provided that the
66+
following conditions are met:
67+
68+
1. Redistributions in source code must retain the above
69+
copyright notice, this list of conditions, and the following
70+
disclaimer.
71+
72+
2. Redistributions in binary form must reproduce the above
73+
copyright notice, this list of conditions, and the following
74+
disclaimer in the documentation and/or other materials
75+
provided with the distribution.
76+
77+
3. The name Zope Corporation (tm) must not be used to
78+
endorse or promote products derived from this software
79+
without prior written permission from Zope Corporation.
80+
81+
4. The right to distribute this software or to use it for
82+
any purpose does not give you the right to use Servicemarks
83+
(sm) or Trademarks (tm) of Zope Corporation. Use of them is
84+
covered in a separate agreement (see
85+
http://www.zope.com/Marks).
86+
87+
5. If any files are modified, you must cause the modified
88+
files to carry prominent notices stating that you changed
89+
the files and the date of any change.
90+
91+
Disclaimer
92+
93+
THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ''AS IS''
94+
AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
95+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
96+
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
97+
NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
98+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
99+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
100+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
101+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
102+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
103+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
104+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
105+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
106+
DAMAGE.
107+
108+
109+
This software consists of contributions made by Zope
110+
Corporation and many individuals on behalf of Zope
111+
Corporation. Specific attributions are listed in the
112+
accompanying credits file.
113+
114+
115+
Note link for http://www.zope.com/Marks is dead.

0 commit comments

Comments
 (0)