diff --git a/README b/README index 6c8097f..c70de03 100644 --- a/README +++ b/README @@ -44,7 +44,7 @@ greatly. By installing and running Auto, you are agreeing to the terms stated in doc/LICENSE. Auto is free but copyrighted software -released under the terms of the 4-clause BSD License. +released under the terms of the 3-clause "New" BSD License. Dependencies: Perl 5.10.0 or later diff --git a/README.md b/README.md index 5c9657b..64f3e11 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ greatly. By installing and running Auto, you are agreeing to the terms stated in doc/LICENSE. Auto is free but copyrighted software -released under the terms of the 4-clause BSD License. +released under the terms of the 3-clause "New" BSD License. Dependencies: Perl 5.10.0 or later diff --git a/doc/LICENSE b/doc/LICENSE index a8b0c68..c844562 100644 --- a/doc/LICENSE +++ b/doc/LICENSE @@ -1,23 +1,20 @@ -Copyright (C) 2010-2011, Xelhua Development Group +Copyright (c) 2010-2011, Xelhua Development Group All rights reserved. Redistribution and use in source and binary forms, with or without 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. - 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the Xelhua Development Group. - 4. Neither the name of the Xelhua Development Group nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. + * 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 Xelhua Development Group 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 XELHUA DEVELOPMENT GROUP ''AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +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 XELHUA DEVELOPMENT GROUP BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES