diff options
| author | lloyd <[email protected]> | 2012-06-09 04:43:34 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-06-09 04:43:34 +0000 |
| commit | ee2e0450a8d51311f920e210f84185cb54e2e517 (patch) | |
| tree | a2232a3e853423a32f7f22b4c9ac4279cff54b4c | |
| parent | d8f1ea81916a8230d8148fce0219beaf67bd0ba6 (diff) | |
Update copyright for 2012.
In the disclaimer text, replace "AUTHOR(S)" and "AUTHOR(S) OR CONTRIBUTOR(S)"
with "COPYRIGHT HOLDERS AND CONTRIBUTORS" and "COPYRIGHT HOLDER OR CONTRIBUTORS",
resp. I thought in 38051c192886db139918c59d31c2e1faa9ea8cee I had made the
license totally identical with the official BSD-2 text, however clearly I
originally got the disclaimer text from somewhere else.
Reindent.
| -rw-r--r-- | doc/license.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/doc/license.txt b/doc/license.txt index aefcee395..55b74ba13 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -7,7 +7,7 @@ License Botan (http://botan.randombit.net/) is distributed under these terms:: - Copyright (C) 1999-2011 Jack Lloyd + Copyright (C) 1999-2012 Jack Lloyd 2001 Peter J Jones 2004-2007 Justin Karneges 2004 Vaclav Ovsik @@ -26,24 +26,23 @@ Botan (http://botan.randombit.net/) is distributed under these terms:: All rights reserved. Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. + 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. + notice, this list of conditions, and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "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 AUTHOR(S) OR CONTRIBUTOR(S) BE + 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. + 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. |