From f8acf30920691e1575a0c3f3b397f9f2b44b83b3 Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Sun, 5 Jan 2025 11:31:42 -0500 Subject: [PATCH] Fix p tags following ListedLicense schema update Signed-off-by: Steve Winslow --- src/APL-1.0.xml | 3 +-- src/CDL-1.0.xml | 30 +++++++++++++++--------------- src/CECILL-1.1.xml | 6 ++---- src/Caldera-no-preamble.xml | 3 +-- src/Caldera.xml | 3 +-- src/OLFL-1.3.xml | 10 +++++----- src/OPUBL-1.0.xml | 20 ++++++++++---------- src/libpng-2.0.xml | 3 +-- 8 files changed, 36 insertions(+), 42 deletions(-) diff --git a/src/APL-1.0.xml b/src/APL-1.0.xml index 7b086e282..25883ea6a 100644 --- a/src/APL-1.0.xml +++ b/src/APL-1.0.xml @@ -906,7 +906,7 @@ __________________________________________________

For the purposes of this License, paragraphs A, B, C, D and E of this Part 6 of Exhibit A are only incorporated and form part of the terms of the License if the Initial Contributor places an "X" or "x" in the selection box alongside the YES answer to the question immediately below.

-

Is this a Patents-Included License pursuant to Section 2.2 of the License? +

Is this a Patents-Included License pursuant to Section 2.2 of the License?

YES [ ]

@@ -915,7 +915,6 @@ __________________________________________________

NO [ ]

-

By default, if YES is not selected by the Initial Contributor, the answer is NO.

diff --git a/src/CDL-1.0.xml b/src/CDL-1.0.xml index 936d5d943..0184b05fe 100644 --- a/src/CDL-1.0.xml +++ b/src/CDL-1.0.xml @@ -16,11 +16,11 @@

Please read this License carefully before downloading or using this material. By downloading or using this material, you are agreeing to be bound by the terms of this License. If you do not or cannot agree to the terms of this License, please do not download or use this material.

- 0.Preamble. + 0.Preamble.

The Common Documentation License (CDL) provides a very simple and consistent license that allows relatively unrestricted use and redistribution of documents while still maintaining the author's credit and intent. To preserve simplicity, the License does not specify in detail how (e.g. font size) or where (e.g. title page, etc.) the author should be credited. To preserve consistency, changes to the CDL are not allowed and all derivatives of CDL documents are required to remain under the CDL. Together, these constraints enable third parties to easily and safely reuse CDL documents, making the CDL ideal for authors who desire a wide distribution of their work. However, this means the CDL does not allow authors to restrict precisely how their work is used or represented, making it inappropriate for those desiring more finely-grained control.

- 1.General; Definitions. -

This License applies to any documentation, manual or other work that contains a notice placed by the Copyright Holder stating that it is subject to the terms of this Common Documentation License version 1.0 (or subsequent version thereof) ("License"). As used in this License: + 1.General; Definitions. +

This License applies to any documentation, manual or other work that contains a notice placed by the Copyright Holder stating that it is subject to the terms of this Common Documentation License version 1.0 (or subsequent version thereof) ("License"). As used in this License:

1.1"Copyright Holder" means the original author(s) of the Document or other owner(s) of the copyright in the Document. @@ -30,13 +30,13 @@ 1.3"Derivative Work" means a work which is based upon a pre-existing Document, such as a revision, modification, translation, abridgment, condensation, expansion, or any other form in which such pre-existing Document may be recast, transformed, or adapted.
1.4"You" or "Your" means an individual or a legal entity exercising rights under this License. -

+
- 2.Basic License. + 2.Basic License.

Subject to all the terms and conditions of this License, You may use, copy, modify, publicly display, distribute and publish the Document and your Derivative Works thereof, in any medium physical or electronic, commercially or non-commercially; provided that: (a) all copyright notices in the Document are preserved; (b) a copy of this License, or an incorporation of it by reference in proper form as indicated in Exhibit A below, is included in a conspicuous location in all copies such that it would be reasonably viewed by the recipient of the Document; and (c) You add no other terms or conditions to those of this License.

- 3.Derivative Works. -

All Derivative Works are subject to the terms of this License. You may copy and distribute a Derivative Work of the Document under the conditions of Section 2 above, provided that You release the Derivative Work under the exact, verbatim terms of this License (i.e., the Derivative Work is licensed as a "Document" under the terms of this License). In addition, Derivative Works of Documents must meet the following requirements: + 3.Derivative Works. +

All Derivative Works are subject to the terms of this License. You may copy and distribute a Derivative Work of the Document under the conditions of Section 2 above, provided that You release the Derivative Work under the exact, verbatim terms of this License (i.e., the Derivative Work is licensed as a "Document" under the terms of this License). In addition, Derivative Works of Documents must meet the following requirements:

(a)All copyright and license notices in the original Document must be preserved. @@ -46,27 +46,27 @@ (c)A statement briefly summarizing how your Derivative Work is different from the original Document must be included in the same place as your copyright notice.
(d)If it is not reasonably evident to a recipient of your Derivative Work that the Derivative Work is subject to the terms of this License, a statement indicating such fact must be included in the same place as your copyright notice. -

+ - 4.Compilation with Independent Works. + 4.Compilation with Independent Works.

You may compile or combine a Document or its Derivative Works with other separate and independent documents or works to create a compilation work ("Compilation"). If included in a Compilation, the Document or Derivative Work thereof must still be provided under the terms of this License, and the Compilation shall contain (a) a notice specifying the inclusion of the Document and/or Derivative Work and the fact that it is subject to the terms of this License, and (b) either a copy of the License or an incorporation by reference in proper form (as indicated in Exhibit A). Mere aggregation of a Document or Derivative Work with other documents or works on the same storage or distribution medium (e.g. a CD-ROM) will not cause this License to apply to those other works.

- 5.NO WARRANTY. + 5.NO WARRANTY.

THE DOCUMENT IS PROVIDED 'AS IS' BASIS, WITHOUT WARRANTY OF ANY KIND, AND THE COPYRIGHT HOLDER EXPRESSLY DISCLAIMS ALL WARRANTIES AND/OR CONDITIONS WITH RESPECT TO THE DOCUMENT, EITHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND OF NONINFRINGEMENT OF THIRD PARTY RIGHTS.

- 6.LIMITATION OF LIABILITY. + 6.LIMITATION OF LIABILITY.

UNDER NO CIRCUMSTANCES SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY INCIDENTAL, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICENSE OR YOUR USE, REPRODUCTION, MODIFICATION, DISTRIBUTION AND/OR PUBLICATION OF THE DOCUMENT, OR ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY.

- 7.Trademarks. + 7.Trademarks.

This License does not grant any rights to use any names, trademarks, service marks or logos of the Copyright Holder (collectively "Marks") and no such Marks may be used to endorse or promote works or products derived from the Document without the prior written permission of the Copyright Holder.

- 8.Versions of the License. + 8.Versions of the License.

Apple Computer, Inc. ("Apple") may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Once a Document has been published under a particular version of this License, You may continue to use it under the terms of that version. You may also choose to use such Document under the terms of any subsequent version of this License published by Apple. No one other than Apple has the right to modify the terms applicable to Documents created under this License.

- 9.Termination. + 9.Termination.

This License and the rights granted hereunder will terminate automatically if You fail to comply with any of its terms. Upon termination, You must immediately stop any further reproduction, modification, public display, distr ibution and publication of the Document and Derivative Works. However, all sublicenses to the Document and Derivative Works which have been properly granted prior to termination shall survive any termination of this License. Provisions which, by their nat ure, must remain in effect beyond the termination of this License shall survive, including but not limited to Sections 5, 6, 7, 9 and 10.

- 10.Waiver; Severability; Governing Law. + 10.Waiver; Severability; Governing Law.

Failure by the Copyright Holder to enforce any provision of this License will not be deemed a waiver of future enforcement of that or any other provision. If for any reason a court of competent jurisdiction finds any provision of this License, or portion thereof, to be unenforceable, that provision of the License will be enforced to the maximum extent permissible so as to effect the economic benefits and intent of the parties, and the remainder of this License will continue in full force and effect. This License shall be governed by the laws of the United States and the State of California, except that body of California law concerning conflicts of law.

diff --git a/src/CECILL-1.1.xml b/src/CECILL-1.1.xml index 757050663..0c171b060 100644 --- a/src/CECILL-1.1.xml +++ b/src/CECILL-1.1.xml @@ -13,7 +13,7 @@

Notice
This Agreement is a free software license that is the result of discussions between its authors in - order to ensure compliance with the two main principles guiding its drafting: + order to ensure compliance with the two main principles guiding its drafting:

- @@ -27,10 +27,9 @@ codes, extended user-rights. -

The following bodies are the authors of this license CeCILL (Ce : CEA, C : CNRS, I : INRIA, LL : Logiciel - Libre): + Libre):

Commissariat à l'Energie Atomique - CEA, a public scientific, technical and industrial @@ -47,7 +46,6 @@ Rocquencourt, BP 105, 78153 Le Chesnay cedex.

-

diff --git a/src/Caldera-no-preamble.xml b/src/Caldera-no-preamble.xml index fbd8f38eb..aa82d3005 100644 --- a/src/Caldera-no-preamble.xml +++ b/src/Caldera-no-preamble.xml @@ -18,13 +18,12 @@

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.

All advertising materials mentioning features or use of this software must display the following - acknowledgement: + acknowledgement:

This product includes software developed or owned by Caldera International, Inc.

-

Neither the name of Caldera International, Inc. nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.

USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA INTERNATIONAL, INC. AND CONTRIBUTORS ``AS diff --git a/src/Caldera.xml b/src/Caldera.xml index cf986a4cd..4e27945ce 100644 --- a/src/Caldera.xml +++ b/src/Caldera.xml @@ -26,13 +26,12 @@

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.

All advertising materials mentioning features or use of this software must display the following - acknowledgement: + acknowledgement:

This product includes software developed or owned by Caldera International, Inc.

-

Neither the name of Caldera International, Inc. nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.

USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA INTERNATIONAL, INC. AND CONTRIBUTORS ``AS diff --git a/src/OLFL-1.3.xml b/src/OLFL-1.3.xml index c108fe645..ea0488c7c 100644 --- a/src/OLFL-1.3.xml +++ b/src/OLFL-1.3.xml @@ -165,7 +165,7 @@ §3 Grant of patent license

Subject to the terms and conditions of this License and compliance with the - provisions of this License, You are hereby granted by each Contributor a + provisions of this License, You are hereby granted by each Contributor a

- @@ -180,8 +180,8 @@ irrevocable (with the exception of the restrictions set out in this Section 3) -

patent license in all rights deriving from the patents, owned and licensable by - the Contributor at the time of the submission of the Contribution, to

+

patent license in all rights deriving from the patents, owned and licensable by + the Contributor at the time of the submission of the Contribution, to

- @@ -208,8 +208,8 @@ import and otherwise transfer -

the Subject Matter of the License.

- However, said patent license shall cover only those rights deriving from the +

the Subject Matter of the License.

+

However, said patent license shall cover only those rights deriving from the patents of the respective Contributors which are indispensable in order not to infringe that patent and only to the extent that the use of the Contributor’s respective Contributions, whether alone or in combination with other diff --git a/src/OPUBL-1.0.xml b/src/OPUBL-1.0.xml index 9022d4f64..5d6201eb8 100644 --- a/src/OPUBL-1.0.xml +++ b/src/OPUBL-1.0.xml @@ -14,7 +14,7 @@ - I.REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS + I.REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS

The Open Publication works may be reproduced and distributed in whole or in part, in any medium physical or electronic, provided that the terms of this license are adhered to, and that this license or an incorporation of it by reference (with any options elected by the author(s) and/or publisher) is displayed in the reproduction.

Proper form for an incorporation by reference is as follows:

Copyright (c) <year> by <author's name or designee>. This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, vX.Y or later (the latest version is presently available at http://www.opencontent.org/openpub/).

@@ -22,17 +22,17 @@

Commercial redistribution of Open Publication-licensed material is permitted.

Any publication in standard (paper) book form shall require the citation of the original publisher and author. The publisher and author's names shall appear on all outer surfaces of the book. On all outer surfaces of the book the original publisher's name shall be as large as the title of the work and cited as possessive with respect to the title.

- II.COPYRIGHT + II.COPYRIGHT

The copyright to each Open Publication is owned by its author(s) or designee.

- III.SCOPE OF LICENSE + III.SCOPE OF LICENSE

The following license terms apply to all Open Publication works, unless otherwise explicitly stated in the document.

Mere aggregation of Open Publication works or a portion of an Open Publication work with other works or programs on the same media shall not cause this license to apply to those other works. The aggregate work shall contain a notice specifying the inclusion of the Open Publication material and appropriate copyright notice.

SEVERABILITY. If any part of this license is found to be unenforceable in any jurisdiction, the remaining portions of the license remain in force.

NO WARRANTY. Open Publication works are licensed and provided "as is" without warranty of any kind, express or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose or a warranty of non-infringement.

- IV.REQUIREMENTS ON MODIFIED WORKS -

All modified versions of documents covered by this license, including translations, anthologies, compilations and partial documents, must meet the following requirements: + IV.REQUIREMENTS ON MODIFIED WORKS +

All modified versions of documents covered by this license, including translations, anthologies, compilations and partial documents, must meet the following requirements:

1.The modified version must be labeled as such. @@ -44,10 +44,10 @@ 4.The location of the original unmodified document must be identified.
5.The original author's (or authors') name(s) may not be used to assert or imply endorsement of the resulting document without the original author's (or authors') permission. -

+ - V.GOOD-PRACTICE RECOMMENDATIONS -

In addition to the requirements of this license, it is requested from and strongly recommended of redistributors that: + V.GOOD-PRACTICE RECOMMENDATIONS +

In addition to the requirements of this license, it is requested from and strongly recommended of redistributors that:

1.If you are distributing Open Publication works on hardcopy or CD-ROM, you provide email notification to the authors of your intent to redistribute at least thirty days before your manuscript or media freeze, to give the authors time to provide updated documents. This notification should describe modifications, if any, made to the document. @@ -55,9 +55,9 @@ 2.All substantive modifications (including deletions) be either clearly marked up in the document or else described in an attachment to the document.
3.Finally, while it is not mandatory under this license, it is considered good form to offer a free copy of any hardcopy and CD-ROM expression of an Open Publication-licensed work to its author(s). -

+ - VI.LICENSE OPTIONS + VI.LICENSE OPTIONS

The author(s) and/or publisher of an Open Publication-licensed document may elect certain options by appending language to the reference to or copy of the license. These options are considered part of the license instance and must be included with the license (or its incorporation by reference) in derived works.

A. To prohibit distribution of substantively modified versions without the explicit permission of the author(s). "Substantive modification" is defined as a change to the semantic content of the document, and excludes mere changes in format or typographical corrections.

To accomplish this, add the phrase `Distribution of substantively modified versions of this document is prohibited without the explicit permission of the copyright holder.' to the license reference or copy.

diff --git a/src/libpng-2.0.xml b/src/libpng-2.0.xml index 1858ec66c..71c91851f 100644 --- a/src/libpng-2.0.xml +++ b/src/libpng-2.0.xml @@ -36,7 +36,7 @@

Permission is hereby granted to use, copy, modify, and distribute this software, or portions hereof, for any purpose, without fee, - subject to the following restrictions: + subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not claim that you wrote the original @@ -51,7 +51,6 @@ 3.This Copyright notice may not be removed or altered from any source or altered source distribution. -