Skip to content

Commit 5568acc

Browse files
committed
Reformat inclusion of COPYING.txt into license.txt.
Include as non-literal text. This removes the need to scroll to read the license. Also makes the hyperlinks work. Colorize the background under the included file to allow easy identification of part of license.txt that is from COPYING.txt like we used to have with the literal inclusion. Had to add raw html to create a div to add the color. Using .. container:: didn't work since indenting .. include:: caused sphinx to throw errors on the headers in COPYING.txt. Reformated COPYING.txt to eliminate unwanted indentation caused by blockquote being triggered.
1 parent 9f3e01f commit 5568acc

File tree

4 files changed

+71
-53
lines changed

4 files changed

+71
-53
lines changed

COPYING.txt

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ Roundup, exclusive of the Zope page templates, is `MIT licensed`_.
55
Roundup Licensing
66
-----------------
77

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
12-
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:
19-
20-
The above copyright notice and this permission notice shall be included in
21-
all copies or substantial portions of the Software.
22-
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.
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
12+
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:
19+
20+
The above copyright notice and this permission notice shall be included in
21+
all copies or substantial portions of the Software.
22+
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.
3030

3131

3232
PageTemplates Licensing
@@ -54,41 +54,41 @@ included below.
5454
Zope Public License (ZPL) Version 2.0
5555
-------------------------------------
5656

57-
This software is Copyright (c) Zope Corporation (tm) and
58-
Contributors. All rights reserved.
57+
This software is Copyright (c) Zope Corporation (tm) and
58+
Contributors. All rights reserved.
5959

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).
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).
6363

64-
Redistribution and use in source and binary forms, with or
65-
without modification, are permitted provided that the
66-
following conditions are met:
64+
Redistribution and use in source and binary forms, with or
65+
without modification, are permitted provided that the
66+
following conditions are met:
6767

68-
1. Redistributions in source code must retain the above
69-
copyright notice, this list of conditions, and the following
70-
disclaimer.
68+
1. Redistributions in source code must retain the above
69+
copyright notice, this list of conditions, and the following
70+
disclaimer.
7171

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.
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.
7676

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.
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.
8080

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).
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).
8686

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.
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.
9090

91-
Disclaimer
91+
Disclaimer
9292

9393
THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ''AS IS''
9494
AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
@@ -106,10 +106,10 @@ Zope Public License (ZPL) Version 2.0
106106
DAMAGE.
107107

108108

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.
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.
113113

114114

115115
Note link for http://www.zope.com/Marks is dead.

doc/_static/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,3 +454,8 @@ ul.multicol {
454454
ul.multicol > * {
455455
margin-block-start: 0; /* remove spacing added by * + * here */
456456
}
457+
458+
div.file_insert { /* use to insert COPYING into license.txt */
459+
background: #f3f1cc;
460+
padding-inline: 0.5em;
461+
}

doc/license.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,12 @@ License
44
Roundup is Free Software under the following license (from the file
55
COPYING.txt in the software distribution):
66

7+
.. raw:: html
8+
9+
<div class="file_insert">
10+
711
.. include:: ../COPYING.txt
12+
13+
.. raw:: html
14+
15+
</div>

website/www/_static/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,11 @@ ul.multicol > * {
455455
margin-block-start: 0; /* remove spacing added by * + * here */
456456
}
457457

458+
div.file_insert { /* use to insert COPYING into license.txt */
459+
background: #f3f1cc;
460+
padding-inline: 0.5em;
461+
}
462+
458463
/* website only */
459464
/* assume desktop reader for local html files, also no contact
460465
page for local doc files */

0 commit comments

Comments
 (0)