Mercurial > p > roundup > code

changeset 7437:0d9f704a7ef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author John Rouillard <rouilj@ieee.org>
date Mon, 29 May 2023 20:29:04 -0400
parents 8a73b0b12102
children 116ea5ce06ab
files COPYING.txt doc/_static/style.css doc/license.txt website/www/_static/style.css
diffstat 4 files changed, 68 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/COPYING.txt	Mon May 29 20:09:40 2023 -0400
+++ b/COPYING.txt	Mon May 29 20:29:04 2023 -0400
@@ -5,28 +5,28 @@
 Roundup Licensing
 -----------------
 
-  Copyright (c) 2009-2022 Roundup-Team (https://opensource.org/license/mit/)
-  Copyright (c) 2003-2009 Richard Jones  (richard@mechanicalcat.net)
-  Copyright (c) 2002 eKit.com Inc
-  Copyright (c) 2001 Bizar Software Pty Ltd
+| Copyright (c) 2009-2022 Roundup-Team (https://opensource.org/license/mit/)
+| Copyright (c) 2003-2009 Richard Jones  (richard@mechanicalcat.net)
+| Copyright (c) 2002 eKit.com Inc
+| Copyright (c) 2001 Bizar Software Pty Ltd
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 PageTemplates Licensing
@@ -54,41 +54,41 @@
 Zope Public License (ZPL) Version 2.0
 -------------------------------------
 
-  This software is Copyright (c) Zope Corporation (tm) and
-  Contributors. All rights reserved.
+This software is Copyright (c) Zope Corporation (tm) and
+Contributors. All rights reserved.
 
-  This license has been certified as open source. It has also
-  been designated as GPL compatible by the Free Software
-  Foundation (FSF).
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
 
-  Redistribution and use in source and binary forms, with or
-  without modification, are permitted provided that the
-  following conditions are met:
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
 
-  1. Redistributions in source code must retain the above
-     copyright notice, this list of conditions, and the following
-     disclaimer.
+1. Redistributions in 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.
+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.
 
-  3. The name Zope Corporation (tm) must not be used to
-     endorse or promote products derived from this software
-     without prior written permission from Zope Corporation.
+3. The name Zope Corporation (tm) must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from Zope Corporation.
 
-  4. The right to distribute this software or to use it for
-     any purpose does not give you the right to use Servicemarks
-     (sm) or Trademarks (tm) of Zope Corporation. Use of them is
-     covered in a separate agreement (see
-     http://www.zope.com/Marks).
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use Servicemarks
+   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
+   covered in a separate agreement (see
+   http://www.zope.com/Marks).
 
-  5. If any files are modified, you must cause the modified
-     files to carry prominent notices stating that you changed
-     the files and the date of any change.
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
 
-  Disclaimer
+Disclaimer
 
     THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ''AS IS''
     AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
@@ -106,10 +106,10 @@
     DAMAGE.
 
 
-  This software consists of contributions made by Zope
-  Corporation and many individuals on behalf of Zope
-  Corporation.  Specific attributions are listed in the
-  accompanying credits file.
+This software consists of contributions made by Zope
+Corporation and many individuals on behalf of Zope
+Corporation.  Specific attributions are listed in the
+accompanying credits file.
 
 
 Note link for http://www.zope.com/Marks is dead.
--- a/doc/_static/style.css	Mon May 29 20:09:40 2023 -0400
+++ b/doc/_static/style.css	Mon May 29 20:29:04 2023 -0400
@@ -454,3 +454,8 @@
 ul.multicol > * {
   margin-block-start: 0; /* remove spacing added by * + * here */
 }
+
+div.file_insert { /* use to insert COPYING into license.txt */
+    background: #f3f1cc;
+    padding-inline: 0.5em;
+}
--- a/doc/license.txt	Mon May 29 20:09:40 2023 -0400
+++ b/doc/license.txt	Mon May 29 20:29:04 2023 -0400
@@ -4,4 +4,12 @@
 Roundup is Free Software under the following license (from the file
 COPYING.txt in the software distribution):
 
+.. raw:: html
+
+   <div class="file_insert">
+
 .. include:: ../COPYING.txt
+
+.. raw:: html
+
+   </div>
--- a/website/www/_static/style.css	Mon May 29 20:09:40 2023 -0400
+++ b/website/www/_static/style.css	Mon May 29 20:29:04 2023 -0400
@@ -455,6 +455,11 @@
   margin-block-start: 0; /* remove spacing added by * + * here */
 }
 
+div.file_insert { /* use to insert COPYING into license.txt */
+    background: #f3f1cc;
+    padding-inline: 0.5em;
+}
+
 /* website only */
 /* assume desktop reader for local html files, also no contact
    page for local doc files */
Roundup Issue Tracker: http://roundup-tracker.org/