Skip to content

Commit 19b0dd8

Browse files
committed
updated LICENSE text
- Use suggested wording from https://choosealicense.com/licenses/bsd-3-clause/ - fixed reST in docs
1 parent 697d993 commit 19b0dd8

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

LICENSE

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
New BSD License
1+
BSD 3-Clause License
22

3-
Copyright (c) 2018 The MDAnalysis Development Team.
3+
Copyright (c) 2018, The MDAnalysis Development Team.
44
All rights reserved.
55

6-
76
Redistribution and use in source and binary forms, with or without
87
modification, are permitted provided that the following conditions are met:
98

10-
a. Redistributions of source code must retain the above copyright notice,
11-
this list of conditions and the following disclaimer.
12-
b. Redistributions in binary form must reproduce the above copyright
13-
notice, this list of conditions and the following disclaimer in the
14-
documentation and/or other materials provided with the distribution.
15-
c. Neither the name of the MDAnalysis Development Team nor the names of
16-
its contributors may be used to endorse or promote products
17-
derived from this software without specific prior written
18-
permission.
9+
1. Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
2. Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
1915

16+
3. Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
2019

21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
22-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
24-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
2524
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
2625
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
2726
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

docs/credits.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ No data are included in this package; please see the `DESCR` attribute
1414
for each data set for authorship, citation, and license information
1515
for the data.
1616

17-
**MDAnalysisData** is made available under the `BSD 3-clause license
17+
**MDAnalysisData** is made available under the `New BSD 3-clause
18+
license
1819
<https://github.com/MDAnalysis/MDAnalysisData/blob/master/LICENSE>`_.
1920

2021
.. _alchemtest: https://alchemtest.readthedocs.io

0 commit comments

Comments
 (0)