Improve license reference consistency.

CONTRIBUTORS.rst

@@ -21,5 +21,5 @@ About
 
 | **colour-science.org** by Colour Developers
 | Copyright 2013 Colour Developers – `[email protected] <[email protected]>`__
-| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
+| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-science.org <https://github.com/colour-science/colour-science.org>`__

LICENSE

@@ -1,24 +1,11 @@
 Copyright 2013 Colour Developers
-All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of the Colour Developers nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL COLOUR DEVELOPERS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+1. Redistributions of 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.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE

README.rst

@@ -27,5 +27,5 @@ About
 
 | **colour-science.org** by Colour Developers
 | Copyright 2013 Colour Developers – `[email protected] <[email protected]>`__
-| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
+| This software is released under terms of BSD-3-Clause: https://opensource.org/licenses/BSD-3-Clause
 | `https://github.com/colour-science/colour-science.org <https://github.com/colour-science/colour-science.org>`__

output/colour/index.html

@@ -27,7 +27,7 @@
 Python package providing a comprehensive number of
 algorithms and datasets for colour science.
 It is freely available under the
-New BSD License terms.
+BSD-3-Clause terms.
 Colour is an affiliated ">
 <meta property="og:type" content="article">
 <meta property="article:published_time" content="2020-04-21T10:48:26+01:00">
@@ -139,7 +139,7 @@
 <a class="reference external" href="https://www.python.org/">Python</a> package providing a comprehensive number of
 algorithms and datasets for colour science.</p>
 <p>It is freely available under the
-<a class="reference external" href="https://opensource.org/licenses/BSD-3-Clause">New BSD License</a> terms.</p>
+<a class="reference external" href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a> terms.</p>
 <p><strong>Colour</strong> is an affiliated project of <a class="reference external" href="https://numfocus.org/">NumFOCUS</a>, a
 501(c)(3) nonprofit in the United States.</p>
 <section id="features"><h2>Features</h2>

output/colour/index.rst

@@ -12,7 +12,7 @@
 algorithms and datasets for colour science.
 
 It is freely available under the
-`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
+`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
 
 **Colour** is an affiliated project of `NumFOCUS <https://numfocus.org/>`__, a
 501(c)(3) nonprofit in the United States.

output/contributing/index.html

@@ -281,7 +281,7 @@
 like would help its implementation: publications, wikipedia article, etc...</p>
 <p>If there is an implementation existing in another language, we will be most
 likely be able to port it although the licence must be compatible with the
-<a class="reference external" href="https://opensource.org/licenses/BSD-3-Clause">New BSD License</a> terms.</p>
+<a class="reference external" href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a> terms.</p>
 <p>We are also running <a class="reference external" href="http://www.mathworks.fr/products/matlab/">Matlab</a>, so
 don't hesitate to provide snippets for it if you have functions you would like
 to be ported.</p>

output/contributing/index.rst

@@ -169,7 +169,7 @@ like would help its implementation: publications, wikipedia article, etc...
 
 If there is an implementation existing in another language, we will be most
 likely be able to port it although the licence must be compatible with the
-`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
+`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
 
 We are also running `Matlab <http://www.mathworks.fr/products/matlab/>`__, so
 don't hesitate to provide snippets for it if you have functions you would like
@@ -515,6 +515,7 @@ Python Style Rules
 .. code:: python
 
     def CCT_to_xy_Kang2002(CCT):
+        ...
 
 -   Please use *British English* words instead of *American English* ones as
     the **CIE** does, the most important of all being **colour** instead of

output/index.html

@@ -143,7 +143,7 @@
                 </p>
                 <p>
                     It is freely available under the
-                    <a href="https://opensource.org/licenses/BSD-3-Clause">New BSD License</a>
+                    <a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
                     terms.
                 </p>
                 <p>

output/index.rst

@@ -22,7 +22,7 @@
                     </p>
                     <p>
                         It is freely available under the
-                        <a href="https://opensource.org/licenses/BSD-3-Clause">New BSD License</a>
+                        <a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
                         terms.
                     </p>
                     <p>

pages/colour.rst

@@ -12,7 +12,7 @@
 algorithms and datasets for colour science.
 
 It is freely available under the
-`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
+`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
 
 **Colour** is an affiliated project of `NumFOCUS <https://numfocus.org/>`__, a
 501(c)(3) nonprofit in the United States.

pages/contributing.rst

@@ -169,7 +169,7 @@ like would help its implementation: publications, wikipedia article, etc...
 
 If there is an implementation existing in another language, we will be most
 likely be able to port it although the licence must be compatible with the
-`New BSD License <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
+`BSD-3-Clause <https://opensource.org/licenses/BSD-3-Clause>`__ terms.
 
 We are also running `Matlab <http://www.mathworks.fr/products/matlab/>`__, so
 don't hesitate to provide snippets for it if you have functions you would like
@@ -515,6 +515,7 @@ Python Style Rules
 .. code:: python
 
     def CCT_to_xy_Kang2002(CCT):
+        ...
 
 -   Please use *British English* words instead of *American English* ones as
     the **CIE** does, the most important of all being **colour** instead of

pages/index.rst

@@ -22,7 +22,7 @@
                     </p>
                     <p>
                         It is freely available under the
-                        <a href="https://opensource.org/licenses/BSD-3-Clause">New BSD License</a>
+                        <a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
                         terms.
                     </p>
                     <p>

tasks.py

@@ -15,7 +15,7 @@
 
 __author__ = "Colour Developers"
 __copyright__ = "Copyright 2013 Colour Developers"
-__license__ = "New BSD License - https://opensource.org/licenses/BSD-3-Clause"
+__license__ = "BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause"
 __maintainer__ = "Colour Developers"
 __email__ = "[email protected]"
 __status__ = "Production"