New upstream version 2301+ds

1 files changed, 69 insertions, 57 deletions

diff --git a/CAreadme.txt b/CAreadme.txt
index 5a1f90479..709989e5c 100644
--- a/CAreadme.txt
+++ b/CAreadme.txt
@@ -1,81 +1,93 @@
-                           LDRAW.ORG

-                    PARTS LIBRARY AGREEMENT

-                          CAreadme.txt

-

-

 LDRAW.ORG PARTS LIBRARY AGREEMENT: CAreadme.txt

 

 1. Introduction

 

-The following is the README text for the LDraw Parts Library

-licenced by the Creative Commons Attribution Licence 2.0 as

-specified by the LDraw Contributor Agreement (CA). Parts which

-fall under this agreement will contain the following line in

-their headers.

+The following is the README text for the LDraw.org Parts Library

+licensed by the Creative Commons Attribution License 2.0 (CC BY 2.0) and

+Creative Commons Attribution License 4.0 International (CC BY 4.0)

+as specified by the LDraw Contributor Agreement (CA).

 

+However this document is not a license! It is simply a handy reference

+for understanding the Legal Code (the full license), which can be

+found in the CAlicense.txt file (CC BY 2.0) or CALicense4.txt (CC BY 4.0),

+it is a human-readable expression of some key terms. Think of it as the

+user-friendly interface to the Legal Code beneath. This text itself has no

+legal value and its contents do not appear in the actual license. For a deeper

+insight please visit:

+http://creativecommons.org/licenses/by/2.0/

+http://creativecommons.org/licenses/by/4.0/

+

+Parts which fall under this agreement will contain one of the following lines in

+the header:

+

+Parts submitted/edited before 2023-03-05 where some (but not all) authors or 

+editors have affirmed the new CA:

+0 !LICENSE Licensed under CC BY 2.0 and CC BY 4.0 : see CAreadme.txt

+

+Modifications of dual licensed parts:

+All modifications to the original work will be listed in individual !HISTORY 

+lines. For all !HISTORY lines dated before 2023-03-05, the modification is 

+licensed under the CC BY 2.0 license. For all !HISTORY lines dated on or after 

+2023-03-05, the modification is licensed under the CC BY 4.0 license

+

+Parts submitted/edited on or after 2023-03-05 or

+Parts submitted/edited before 2023-03-05 where all authors and editors have 

+affirmed the new CA:

+0 !LICENSE Licensed under CC BY 4.0 : see CAreadme.txt

+

+Note:

+The following line was originally used in the Parts Library and its use is

+considered to be depreciated. "CCAL version 2.0" should be

+read to mean CC BY 2.0.

 0 !LICENSE Redistributable under CCAL version 2.0 : see CAreadme.txt

 

-However this text is not a license! It is simply a handy reference

-for understanding the Legal Code (the full license), which can be

-found in the CAlicense.txt file - it is a human-readable expression

-of some key terms.  Think of it as the user-friendly interface to

-the Legal Code beneath.  This text itself has no legal value and its

-contents do not appear in the actual licence.  For a deeper insight

-please visit: http://creativecommons.org/licenses/by/2.0/

 

 2. Rights

 

 You are free:

+  * To distribute, remix, adapt, and build upon the material in any

+    medium or format, so long as attribution, as specified by the license,

+    is given to the creator.

+  * To make commercial use of the CA approved LDraw Parts Library

 

-   * to copy, distribute, display, and use the CA approved LDraw

-     Parts Library

-   * to make derivative works

-   * to make commercial use of the CA approved LDraw Parts Library

-

-Under the following conditions:

-

-3. Attribution.

-

-You must give the original author credit.

-

-   * For any reuse or distribution, you must make clear to others

-     the licence terms of this library.

-   * Any of these conditions can be waived if you get permission

-     from the copyright holder.

+Given the following attribution is provided:

+  1. Name the creator

+  2. Provide a URL for the work

+  3. Name the license

+  4. Provide a URL for the license

+  5. Note whether the work has been modified

 

-The LDraw Steering Committee (SteerCo) also holds an attribution

-to 'The LDraw Parts Library' in such Derivative Works to be sufficient

-in lieu of a full list of authors.

+Items 1-4 are provided by either the file itself or this document. Item 5 is 

+your responsibility if you have modified the work.

 

-Your fair use and other rights are in no way affected by the above.

+Please read the following best practices article regarding attribution:

+https://wiki.creativecommons.org/wiki/best_practices_for_attribution

 

 4. Enforcements

 

 The single copyright holders are the sole entity responsible for

 enforcements of their copyrights. For purposes of enforcement

 LDraw.org considers the following good rules of thumb to determine

-if a new file is not a  Derivative work.  Anything else should be

+if a new file is not a Derivative Work. Anything else should be

 considered a Derivative work and an attribution would be required.

-If in doubt contact the current LDraw SteerCo.

+If in doubt, contact the current LDraw SteerCo.

 

 What is not considered a Derivative work?

 

-   * Rendered images generated from the LDraw library. Rendering here

-     covers any conversion of a 3D model file into a 2D image.

-

-   * Model files containing references only (the source code for the

-     part may NOT be included in any form) to parts in the official

-     LDraw Parts Library at the time of their creation. Part files

-     which are marked as unofficial at the time of creation may be

-     included in full in the model file. If the sole or main purpose (as

-     determined by the LDraw SteerCo in consultation with the potentially

-     offending author and LDraw community at large) of the Model file

-     is to include large numbers of unofficial parts then it WILL be

-     considered a derivative work.

-

-   * Alternative libraries of parts which LDraw.org does not own or

-     enforce the copyright. If some or more of the parts in the library

-     are converted from the LDraw Parts Library then they must be

-     considered a Derivative work.

-

-LDraw.org, July 2008

+  * Rendered images generated from the LDraw library. Rendering here

+    covers any conversion of a 3D model file into a 2D image.

+

+  * Model files containing references only (the source code for the

+    part may NOT be included in any form) to parts in the official

+    LDraw Parts Library at the time of their creation. Part files

+    which are marked as unofficial at the time of creation may be

+    included in full in the model file. If the sole or main purpose (as

+    determined by the LDraw SteerCo in consultation with the potentially

+    offending author and the LDraw community at large) of the model file

+    is to include large numbers of unofficial parts then it WILL be

+    considered a derivative work.

+

+  * Alternative libraries of parts which LDraw.org does not own or

+    enforce the copyright. If some or more of the parts in the library

+    are converted from the LDraw Parts Library then they must be

+    considered a Derivative Work.
\ No newline at end of file