From 19b0dd835e964818e4ff11e081522eadf1e2a203 Mon Sep 17 00:00:00 2001 From: Oliver Beckstein <orbeckst@gmail.com> Date: Wed, 10 Oct 2018 16:44:02 -0700 Subject: [PATCH] updated LICENSE text - Use suggested wording from https://choosealicense.com/licenses/bsd-3-clause/ - fixed reST in docs --- LICENSE | 31 +++++++++++++++---------------- docs/credits.rst | 3 ++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 8c494d2..fd0bfb2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,27 +1,26 @@ -New BSD License +BSD 3-Clause License -Copyright (c) 2018 The MDAnalysis Development Team. +Copyright (c) 2018, The MDAnalysis Development Team. All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - a. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - b. 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. - c. Neither the name of the MDAnalysis Development Team nor the names of - its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. +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 HOLDERS OR CONTRIBUTORS BE LIABLE +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 diff --git a/docs/credits.rst b/docs/credits.rst index 837fec0..d8c685b 100644 --- a/docs/credits.rst +++ b/docs/credits.rst @@ -14,7 +14,8 @@ No data are included in this package; please see the `DESCR` attribute for each data set for authorship, citation, and license information for the data. -**MDAnalysisData** is made available under the `BSD 3-clause license +**MDAnalysisData** is made available under the `New BSD 3-clause + license <https://github.com/MDAnalysis/MDAnalysisData/blob/master/LICENSE>`_. .. _alchemtest: https://alchemtest.readthedocs.io