Skip to content

Commit

Permalink
updated LICENSE text
Browse files Browse the repository at this point in the history
- Use suggested wording from https://choosealicense.com/licenses/bsd-3-clause/
- fixed reST in docs
  • Loading branch information
orbeckst committed Oct 10, 2018
1 parent 697d993 commit 19b0dd8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
31 changes: 15 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion docs/credits.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 19b0dd8

Please sign in to comment.