httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/htdocs/manual/search manual-index.cgi
Date Fri, 31 Mar 2000 06:42:48 GMT
fielding    00/03/30 22:42:48

  Modified:    htdocs/manual LICENSE expand.pl
               htdocs/manual/search manual-index.cgi
  Log:
  Update to Apache Software License version 1.1
  
  Revision  Changes    Path
  1.9       +36 -36    apache-2.0/htdocs/manual/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/apache-2.0/htdocs/manual/LICENSE,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LICENSE	2000/03/17 15:16:40	1.8
  +++ LICENSE	2000/03/31 06:42:47	1.9
  @@ -1,58 +1,58 @@
   /* ====================================================================
  - * 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
    * 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. 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/)."
  - *
  - * 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.
  + * 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 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.
    */
  -
   
  
  
  
  1.7       +36 -36    apache-2.0/htdocs/manual/expand.pl
  
  Index: expand.pl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/htdocs/manual/expand.pl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- expand.pl	1999/01/01 19:04:34	1.6
  +++ expand.pl	2000/03/31 06:42:47	1.7
  @@ -11,58 +11,58 @@
   # 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
   # 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. 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. 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.
  -#
  -# 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/)."
  -#
  -# 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 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
   
  
  
  
  1.10      +37 -27    apache-2.0/htdocs/manual/search/manual-index.cgi
  
  Index: manual-index.cgi
  ===================================================================
  RCS file: /home/cvs/apache-2.0/htdocs/manual/search/manual-index.cgi,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- manual-index.cgi	1999/02/26 00:39:58	1.9
  +++ manual-index.cgi	2000/03/31 06:42:48	1.10
  @@ -1,46 +1,56 @@
   #!/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
   # 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. 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
  
  
  

Mime
View raw message