diff options
author | Ryan Bloom <rbb@apache.org> | 2000-03-10 01:07:37 +0100 |
---|---|---|
committer | Ryan Bloom <rbb@apache.org> | 2000-03-10 01:07:37 +0100 |
commit | b1c26f031a9196baae7b4a3a38388d8303588a7d (patch) | |
tree | 3247a76f29ed6b44f2c530a69e23ae5335e67fb3 /LICENSE | |
parent | PR: (diff) | |
download | apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.tar.xz apache2-b1c26f031a9196baae7b4a3a38388d8303588a7d.zip |
Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ /* ==================================================================== - * Copyright (c) 1995-1999 The Apache Group. All rights reserved. + * Copyright (c) 1995-2000 The Apache Software Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,27 +15,27 @@ * * 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 + * "This product includes software developed by the Apache Software Foundation * 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 + * 4. The names "Apache Server" 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 * apache@apache.org. * * 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. + * permission of the Apache Software Foundation. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: - * "This product includes software developed by the Apache Group + * "This product includes software developed by the Apache Software Foundation * for use in the Apache HTTP server project (http://www.apache.org/)." * - * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY THE Apache Software Foundation ``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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE Apache Software Foundation 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; @@ -47,10 +47,10 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Group and was originally based + * individuals on behalf of the Apache Software Foundation 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 + * For more information on the Apache Software Foundation and the Apache HTTP server * project, please see <http://www.apache.org/>. * */ |