fielding 96/12/02 09:21:26
Modified: htdocs/manual LICENSE
Log:
Crikey, how did this one slip by for so long?
Revision Changes Path
1.2 +51 -48 apache/htdocs/manual/LICENSE
Index: LICENSE
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** LICENSE 1996/11/18 19:50:16 1.1
--- LICENSE 1996/12/02 17:21:25 1.2
***************
*** 1,51 ****
- Apache httpd license
- ====================
- This is the license for the Apache Server. It covers all the
- files which come in this distribution, and should never be removed.
-
- The "Apache Group" has based this server, called "Apache", on
- public domain code distributed under the name "NCSA httpd 1.3".
-
- NCSA httpd 1.3 was placed in the public domain by the National Center
- for Supercomputing Applications at the University of Illinois
- at Urbana-Champaign.
-
- As requested by NCSA we acknowledge,
-
- "Portions developed at the National Center for Supercomputing
- Applications at the University of Illinois at Urbana-Champaign."
-
- Copyright on the sections of code added by the "Apache Group" belong
- to the "Apache Group" and/or the original authors. The "Apache Group" and
- authors hereby grant permission for their code, along with the
- public domain NCSA code, to be distributed under the "Apache" name.
-
- Reuse of "Apache Group" code outside of the Apache distribution should
- be acknowledged with the following quoted text, to be included with any new
- work;
-
- "Portions developed by the "Apache Group", taken with permission
- from the Apache Server http://www.hyperreal.com/apache/ "
-
-
- Permission is hereby granted to anyone to redistribute Apache under
- the "Apache" name. We do not grant permission for the resale of Apache, but
- we do grant permission for vendors to bundle Apache free with other
software,
- or to charge a reasonable price for redistribution, provided it is made
- clear that Apache is free. Permission is also granted for vendors to
- sell support for for Apache. We explicitly forbid the redistribution of
- Apache under any other name.
-
- The "Apache Group" makes no promises to support "Apache". Users and
- sellers of Apache support, and users of "Apache Group" code, should be
- aware that they use "Apache" or portions of the "Apache Group" code at
- their own risk. While every effort has been made to ensure that "Apache"
- is robust and safe to use, we will not accept responsibility for any
- damage caused, or loss of data or income which results from its use.
-
-
-
- Apache httpd server (c) 1995 The Apache Group.
--- 1,54 ----
+ /* ====================================================================
+ * Copyright (c) 1995,1996 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.
+ *
+ * 5. 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 <http://www.apache.org/>.
+ *
+ */
