Merge pull request #488 from mlinksva/patch-3

Accommodate canonical CC-BY-4.0 text

Author: jlovejoy

src/CC-BY-4.0.xml

@@ -6,7 +6,7 @@
          <crossRef>http://creativecommons.org/licenses/by/4.0/legalcode</crossRef>
       </crossRefs>
       <titleText>
-         <p>Creative Commons Attribution 4.0 International</p>
+         <p><optional>Creative Commons </optional>Attribution 4.0 International</p>
       </titleText>
       <optional>
          <p>Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services
@@ -26,7 +26,7 @@
          license they choose before applying it. Licensors should also secure all rights necessary before
          applying our licenses so that the public can reuse the material as expected. Licensors should clearly
          mark any material not subject to the license. This includes other CC-licensed material, or material
-         used under an exception or limitation to copyright. More considerations for licensors.</p>
+         used under an exception or limitation to copyright. More considerations for licensors<alt match=": wiki.creativecommons.org/Considerations_for_licensors|\." name="considerationsLicensors">: wiki.creativecommons.org/Considerations_for_licensors</alt></p>
          <p>Considerations for the public: By using one of our public licenses, a licensor grants the public
          permission to use the licensed material under specified terms and conditions. If the licensor’s
          permission is not necessary for any reason–for example, because of any applicable exception or
@@ -35,9 +35,9 @@
          the licensed material may still be restricted for other reasons, including because others have
          copyright or other rights in the material. A licensor may make special requests, such as asking that
          all changes be marked or described. Although not required by our licenses, you are encouraged to
-         respect those requests where reasonable. More considerations for the public.</p>
+         respect those requests where reasonable. More<alt match=" |_" name="spaceUnderscore"> </alt>considerations for the public<alt match=": wiki.creativecommons.org/Considerations_for_licensees|\." name="considerationsLicensees">: wiki.creativecommons.org/Considerations_for_licensees</alt></p>
       </optional>
-    
+
       <titleText>
          <p>Creative Commons Attribution 4.0 International Public License</p>
       </titleText>
@@ -310,12 +310,12 @@
           <item>
             <bullet>c.</bullet>
             You must comply with the conditions in Section 3(a) if You Share all or a substantial portion
-               of the contents of the database. 
+               of the contents of the database.
           </item>
         </list>
       <p>For the avoidance of doubt, this Section 4 supplements and does not replace Your
          obligations under this Public License where the Licensed Rights include other
-         Copyright and Similar Rights. 
+         Copyright and Similar Rights.
       </p>
       <p>Section 5 – Disclaimer of Warranties and Limitation of Liability.</p>
         <list>
@@ -429,14 +429,15 @@
         </list>
       <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
          apply one of its public licenses to material it publishes and in those instances will be considered
-         the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative
+         the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
+         domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
          Commons public license or as otherwise permitted by the Creative Commons policies published at
          creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
          Commons” or any other trademark or logo of Creative Commons without its prior written consent
          including, without limitation, in connection with any unauthorized modifications to any of its public
          licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
-         For the avoidance of doubt, this paragraph does not form part of the public licenses. 
-        <br/>Creative Commons may be contacted at creativecommons.org. </p>
-      
+         For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
+      <p>Creative Commons may be contacted at creativecommons.org.</p>
+
     </license>
-</SPDXLicenseCollection>
+</SPDXLicenseCollection>

src/CC-BY-NC-4.0.xml

@@ -6,7 +6,7 @@
          <crossRef>http://creativecommons.org/licenses/by-nc/4.0/legalcode</crossRef>
       </crossRefs>
       <titleText>
-         <p>Creative Commons Attribution-NonCommercial 4.0 International</p>
+         <p><optional>Creative Commons </optional>Attribution-NonCommercial 4.0 International</p>
       </titleText>
       <optional>
         <p>Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services
@@ -28,7 +28,7 @@
                     license they choose before applying it. Licensors should also secure all rights necessary before
                     applying our licenses so that the public can reuse the material as expected. Licensors should clearly
                     mark any material not subject to the license. This includes other CC-licensed material, or material
-                    used under an exception or limitation to copyright. More considerations for licensors.</p>
+                    used under an exception or limitation to copyright. More considerations for licensors<alt match=": wiki.creativecommons.org/Considerations_for_licensors|\." name="considerationsLicensors">: wiki.creativecommons.org/Considerations_for_licensors</alt></p>
             </item>
            <item>
                <p>Considerations for the public: By using one of our public licenses, a licensor grants the public
@@ -39,14 +39,14 @@
                     the licensed material may still be restricted for other reasons, including because others have
                     copyright or other rights in the material. A licensor may make special requests, such as asking that
                     all changes be marked or described. Although not required by our licenses, you are encouraged to
-                    respect those requests where reasonable. More considerations for the public.</p> 
+                    respect those requests where reasonable. More<alt match=" |_" name="spaceUnderscore"> </alt>considerations for the public<alt match=": wiki.creativecommons.org/Considerations_for_licensees|\." name="considerationsLicensees">: wiki.creativecommons.org/Considerations_for_licensees</alt></p>
             </item>
         </list>
       </optional>
       <titleText>
         <p>Creative Commons Attribution-NonCommercial 4.0 International Public License</p>
       </titleText>
-    
+
         <p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and
             conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License
             ("Public License"). To the extent this Public License may be interpreted as a contract, You are
@@ -243,7 +243,7 @@
             </item>
             <item>
                 <p>Section 3 – License Conditions.</p>
-                <p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p> 
+                <p>Your exercise of the Licensed Rights is expressly made subject to the following conditions.</p>
                 <list>
                     <item>
                         <bullet>a.</bullet>
@@ -460,14 +460,15 @@
         </list>
         <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
             apply one of its public licenses to material it publishes and in those instances will be considered
-            the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative
+            the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
+            domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
             Commons public license or as otherwise permitted by the Creative Commons policies published at
             creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
             Commons” or any other trademark or logo of Creative Commons without its prior written consent
             including, without limitation, in connection with any unauthorized modifications to any of its public
             licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
             For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
-        <p>Creative Commons may be contacted at creativecommons.org. </p>    
-      
+        <p>Creative Commons may be contacted at creativecommons.org.</p>
+
     </license>
-</SPDXLicenseCollection>
+</SPDXLicenseCollection>

src/CC-BY-NC-ND-4.0.xml

@@ -6,7 +6,7 @@
          <crossRef>http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode</crossRef>
       </crossRefs>
       <titleText>
-         <p>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</p>
+         <p><optional>Creative Commons </optional>Attribution-NonCommercial-NoDerivatives 4.0 International</p>
       </titleText>
       <optional>
          <p>Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services
@@ -26,7 +26,7 @@
          license they choose before applying it. Licensors should also secure all rights necessary before
          applying our licenses so that the public can reuse the material as expected. Licensors should clearly
          mark any material not subject to the license. This includes other CC-licensed material, or material
-         used under an exception or limitation to copyright. More considerations for licensors.</p>
+         used under an exception or limitation to copyright. More considerations for licensors<alt match=": wiki.creativecommons.org/Considerations_for_licensors|\." name="considerationsLicensors">: wiki.creativecommons.org/Considerations_for_licensors</alt></p>
          <p>Considerations for the public: By using one of our public licenses, a licensor grants the public
          permission to use the licensed material under specified terms and conditions. If the licensor’s
          permission is not necessary for any reason–for example, because of any applicable exception or
@@ -35,7 +35,7 @@
          the licensed material may still be restricted for other reasons, including because others have
          copyright or other rights in the material. A licensor may make special requests, such as asking that
          all changes be marked or described. Although not required by our licenses, you are encouraged to
-         respect those requests where reasonable. More considerations for the public.</p>
+         respect those requests where reasonable. More<alt match=" |_" name="spaceUnderscore"> </alt>considerations for the public<alt match=": wiki.creativecommons.org/Considerations_for_licensees|\." name="considerationsLicensees">: wiki.creativecommons.org/Considerations_for_licensees</alt></p>
          <p>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License</p>
          <p>By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and
          conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public
@@ -44,7 +44,7 @@
          the Licensor grants You such rights in consideration of benefits the Licensor receives from making the
          Licensed Material available under these terms and conditions.</p>
       </optional>
-    
+
       <list>
         <item>
             <p>Section 1 – Definitions.</p>
@@ -293,7 +293,7 @@
                   If requested by the Licensor, You must remove any of the information required by Section
                      3(a)(1)(A) to the extent reasonably practicable.
                 </item>
-                  </list> 
+                  </list>
                </item>
             </list>
         </item>
@@ -322,7 +322,7 @@
             </list>
             <p>For the avoidance of doubt, this Section 4 supplements and does not replace Your
              obligations under this Public License where the Licensed Rights include other
-             Copyright and Similar Rights.</p>          
+             Copyright and Similar Rights.</p>
         </item>
         <item>
             <p>Section 5 – Disclaimer of Warranties and Limitation of Liability.</p>
@@ -442,14 +442,15 @@
       </list>
       <p>Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to
          apply one of its public licenses to material it publishes and in those instances will be considered
-         the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative
+         the “Licensor.” <optional>The text of the Creative Commons public licenses is dedicated to the public
+         domain under the CC0 Public Domain Dedication.</optional> Except for the limited purpose of indicating that material is shared under a Creative
          Commons public license or as otherwise permitted by the Creative Commons policies published at
          creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative
          Commons” or any other trademark or logo of Creative Commons without its prior written consent
          including, without limitation, in connection with any unauthorized modifications to any of its public
          licenses or any other arrangements, understandings, or agreements concerning use of licensed material.
-         For the avoidance of doubt, this paragraph does not form part of the public licenses. 
-        <br/>Creative Commons may be contacted at creativecommons.org.</p>
-      
+         For the avoidance of doubt, this paragraph does not form part of the public licenses.</p>
+      <p>Creative Commons may be contacted at creativecommons.org.</p>
+
     </license>
-</SPDXLicenseCollection>
+</SPDXLicenseCollection>