Commit 51eb92d4 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Update to Apache Software License version 1.1 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84875 13f79535-47bb-0310-9956-ffa450edef68
parent 338d80d5

docs/manual/LICENSE

+33 −33
Changes for docs/manual/LICENSE: 33 added lines, 33 removed lines.
Original line number Diff line number Diff line 
/* ====================================================================

 * Copyright (c) 1995-2000 The Apache Software Foundation.  All rights reserved.

 * The Apache Software License, Version 1.1

 *

 * Copyright (c) 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
@@ -13,46 +16,43 @@ 
 *    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 Software Foundation

 *    for use in the Apache HTTP server project (http://www.apache.org/)."

 * 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 "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.

 * 4. The names "Apache" 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

 * 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.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "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 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 Software Foundation OR

 * 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 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;

 * 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.

 * 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 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 Software Foundation and the Apache HTTP server

 * project, please see <http://www.apache.org/>.

 * individuals on behalf of the Apache Software Foundation.  For more

 * information on the Apache Software Foundation, please see

 * <http://www.apache.org/>.

 *

 * Portions of this software are based upon public domain software

 * originally written at the National Center for Supercomputing Applications,

 * University of Illinois, Urbana-Champaign.

 */

docs/manual/expand.pl

+32 −32
Changes for docs/manual/expand.pl: 32 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -11,7 +11,10 @@ 
# Nov 30, 1996 - Alexei Kosut <akosut@apache.org>



# ====================================================================

# Copyright (c) 1996-1999 The Apache Group.  All rights reserved.

# The Apache Software License, Version 1.1

#

# Copyright (c) 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
@@ -25,44 +28,41 @@ 
#    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.

# 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.

#

# 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.

# 4. The names "Apache" 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.

#

# 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/)."

# 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 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

# 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 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;

# 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.

# 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/>.

# individuals on behalf of the Apache Software Foundation.  For more

# information on the Apache Software Foundation, please see

# <http://www.apache.org/>.

#



# Put a list of dirs (except ..) into @dirs

docs/manual/search/manual-index.cgi

+36 −26
Changes for docs/manual/search/manual-index.cgi: 36 added lines, 26 removed lines.
Original line number Diff line number Diff line 
#!/usr/local/bin/perl5 -w

# ====================================================================

# Copyright (c) 1995-1997 The Apache Group.  All rights reserved.

# The Apache Software License, Version 1.1

#

# Copyright (c) 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
@@ -14,34 +17,41 @@ 
#    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

# 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 "Apache" 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 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 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;

# 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.

# 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 Software Foundation.  For more

# information on the Apache Software Foundation, please see

# <http://www.apache.org/>.

#

# manual-index.cgi script

# originally written by Ken Coar <Coar@DECUS.Org> in May 1997

#