From: <bil...@us...> - 2003-02-26 09:28:46
|
Update of /cvsroot/proxool/proxool In directory sc8-pr-cvs1:/tmp/cvs-serv18380 Modified Files: LICENCE.txt Log Message: fixed licence to now reference Proxool not Apache! Doh. The licence is now *like* an Apache Licence. Index: LICENCE.txt =================================================================== RCS file: /cvsroot/proxool/proxool/LICENCE.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LICENCE.txt 24 Sep 2002 09:34:38 -0000 1.2 --- LICENCE.txt 26 Feb 2003 09:28:28 -0000 1.3 *************** *** 6,63 **** $Author$ ! /* ==================================================================== ! * Copyright (c) 1995-1999 The Apache 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 acknowledgment: ! * "This product includes software developed by the Apache Group ! * for use in the Apache HTTP server project (http://www.apache.org/)." ! * ! * 4. The names "Apache Server" and "Apache Group" must not be used to ! * endorse or promote products derived from this software without ! * prior written permission. For written permission, please contact ! * ap...@ap.... ! * ! * 5. Products derived from this software may not be called "Apache" ! * nor may "Apache" appear in their names without prior written ! * permission of the Apache Group. ! * ! * 6. Redistributions of any form whatsoever must retain the following ! * acknowledgment: ! * "This product includes software developed by the Apache Group ! * for use in the Apache HTTP server project (http://www.apache.org/)." ! * ! * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY ! * EXPRESSED 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 APACHE GROUP OR ! * ITS 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. ! * ==================================================================== ! * ! * This software consists of voluntary contributions made by many ! * individuals on behalf of the Apache Group and was originally based ! * on public domain software written at the National Center for ! * Supercomputing Applications, University of Illinois, Urbana-Champaign. ! * For more information on the Apache Group and the Apache HTTP server ! * project, please see . ! * ! */ --- 6,60 ---- $Author$ ! ==================================================================== ! Copyright (c) 2002 - 2003 Proxool. 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 acknowledgment: ! ! "This product includes software developed by the ! Proxool project (http://proxool.sourceforge.net/)." ! ! 4. The name "Proxool" must not be used to endorse or promote ! products derived from this software without prior written permission. ! For written permission, please contact bi...@lo.... ! ! 5. Products derived from this software may not be called "Proxool" ! nor may "Proxool" appear in their names without prior written ! permission of the Proxool Project. ! ! 6. Redistributions of any form whatsoever must retain the following ! acknowledgment: ! ! "This product includes software developed by the ! Proxool project (http://proxool.sourceforge.net/)." ! ! THIS SOFTWARE IS PROVIDED BY THE PROXOOL PROJECT ``AS IS'' AND ANY ! EXPRESSED 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 PROXOOL PROJECT OR ! ITS 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. ! ==================================================================== ! ! This software consists of voluntary contributions made by many ! individuals on behalf of the Proxool Project. For more information ! on the Proxool Project please see http://proxool.sourceforge.net. ! |