jkeyes 2004/01/22 15:08:16
Modified: cli Tag: RESEARCH_CLI_2_ROXSPRING LICENSE.txt
Log:
- use license header from website
Revision Changes Path
No revision
No revision
1.2.2.1 +11 -15 jakarta-commons/cli/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/jakarta-commons/cli/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- LICENSE.txt 9 Oct 2003 20:57:47 -0000 1.2
+++ LICENSE.txt 22 Jan 2004 23:08:15 -0000 1.2.2.1
@@ -1,13 +1,9 @@
/*
- * $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
- *
+ *
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,28 +11,28 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 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 acknowledgement:
- * "This product includes software developed by the
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgement may appear in the software itself,
* if and wherever such third-party acknowledgements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * 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 names without prior written
- * permission of the Apache Software Foundation.
+ * 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
@@ -57,4 +53,4 @@
* 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]
