diff --git a/COPYRIGHT b/COPYRIGHT index 0fc441006..b636ae96b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -6,16 +6,16 @@ Doctrine Doctrine is a Object Relational Mapper built from scratch with PHP5. It contains a few ports of other popular PHP classes/libraries. -Url: http://www.phpdoctrine.net +Url: http://www.phpdoctrine.org Copyright: 2005-2007 Konsta Vesterinen -License: GPL - see LICENSE file +License: LGPL - see LICENSE file symfony ------- Doctrine contains ports of a few symfony classes/libraries -Url: http://www.symfony-project.com/ +Url: http://www.symfony-project.org Copyright: Fabien Potencier License: MIT - see LICENSE file @@ -34,4 +34,4 @@ Zend Framework Doctrine contains ports of a few Zend components and has borrowed concepts and ideas from the Zend Framework project. Url: http://framework.zend.com -Copyright: Copyright © 2006-2007 by Zend Technologies, All rights reserved. \ No newline at end of file +Copyright: Copyright © 2006-2007 by Zend Technologies, All rights reserved. diff --git a/LICENSE b/LICENSE index 83a3d671b..5e4900d99 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,16 @@ Copyright (c) 2005-2007 Konsta Vesterinen -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +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 +OWNER 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. -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +This software consists of voluntary contributions made by many individuals +and is licensed under the LGPL. For more information, see . \ No newline at end of file