donaldp 2003/02/28 18:24:44
Modified: . LICENSE.txt
Log:
Fixup year and names
Revision Changes Path
1.3 +15 -15 avalon-phoenix/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/avalon-phoenix/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE.txt 12 Jul 2002 22:45:40 -0000 1.2
+++ LICENSE.txt 1 Mar 2003 02:24:44 -0000 1.3
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
-
+
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
+
Redistribution and use in source and binary forms, with or without modifica-
tion, 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. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Avalon", "Phoenix" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this
- software without prior written permission. For written permission, please
+
+ 4. The names "Avalon", "Phoenix" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this
+ software without prior written permission. For written permission, please
contact [EMAIL PROTECTED]
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``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
@@ -41,9 +41,9 @@
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 Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
