You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gs...@apache.org on 2002/09/12 20:31:47 UTC
cvs commit: httpd-python/Doc copyright.tex
gstein 2002/09/12 11:31:47
Modified: . COPYRIGHT
Doc copyright.tex
Log:
Fix up the copyright files.
Revision Changes Path
1.5 +48 -40 httpd-python/COPYRIGHT
Index: COPYRIGHT
===================================================================
RCS file: /home/cvs/httpd-python/COPYRIGHT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- COPYRIGHT 6 Dec 2000 03:05:36 -0000 1.4
+++ COPYRIGHT 12 Sep 2002 18:31:47 -0000 1.5
@@ -1,64 +1,72 @@
/* ====================================================================
- * Copyright (c) 2000 Gregory Trubetskoy. All rights reserved.
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 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. The end-user documentation included with the redistribution, if
- * any, must include the following acknowledgment: "This product
- * includes software developed by Gregory Trubetskoy."
- * Alternately, this acknowledgment may appear in the software itself,
+ * 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 "mod_python", "modpython" or "Gregory Trubetskoy" must not
- * be used to endorse or promote products derived from this software
- * without prior written permission. For written permission, please
- * contact grisha@modpython.org.
- *
- * 5. Products derived from this software may not be called "mod_python"
- * or "modpython", nor may "mod_python" or "modpython" appear in their
- * names without prior written permission of Gregory Trubetskoy.
- *
- * THIS SOFTWARE IS PROVIDED BY GREGORY TRUBETSKOY ``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 GREGORY TRUBETSKOY OR
- * HIS 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.
+ * 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",
+ * "mod_python", or "modpython", nor may these terms 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.
* ====================================================================
*
- * This software is based on the original concept
- * as published in the book "Internet Programming with Python"
- * by Aaron Watters, Guido van Rossum and James C. Ahlstrom,
- * 1996 M&T Books, ISBN: 1-55851-484-8. The book and original
- * software is Copyright 1996 by M&T Books.
+ * 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/>.
+ *
+ * Originally developed by Gregory Trubetskoy <gr...@apache.org>
+ *
+ *
+ * This software is based on the original concept as published in the
+ * book "Internet Programming with Python" by Aaron Watters, Guido van
+ * Rossum and James C. Ahlstrom, 1996 M&T Books, ISBN: 1-55851-484-8.
+ * The book and original software is Copyright 1996 by M&T Books.
*
* This software consists of an extension to the Apache http server.
- * More information about Apache may be found at
+ * More information about Apache may be found at:
*
- * http://www.apache.org/
+ * http://www.apache.org/
*
- * More information on Python language can be found at
+ * More information on Python language can be found at:
*
- * http://www.python.org/
+ * http://www.python.org/
*
*/
-
-
-
-
1.4 +25 -23 httpd-python/Doc/copyright.tex
Index: copyright.tex
===================================================================
RCS file: /home/cvs/httpd-python/Doc/copyright.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copyright.tex 17 Jun 2002 22:09:31 -0000 1.3
+++ copyright.tex 12 Sep 2002 18:31:47 -0000 1.4
@@ -1,4 +1,4 @@
-\centerline{\strong{Copyright \copyright\ 2002 Gregory Trubetskoy All rights reserved.}}
+\centerline{\strong{Copyright \copyright\ 2000-2002 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
@@ -18,35 +18,37 @@
\item
The end-user documentation included with the redistribution, if any,
must include the following acknowledgment: "This product includes
-software developed by Gregory Trubetskoy." Alternately, this
-acknowledgment may appear in the software itself, if and wherever such
-third-party acknowledgments normally appear.
+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.
\item
-The names "mod_python", "modpython" or "Gregory Trubetskoy" must not
-be used to endorse or promote products derived from this software
-without prior written permission. For written permission, please
-contact \email{grisha@modpython.org}.
+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
+\email{apache@apache.org}.
\item
-Products derived from this software may not be called "mod_python"
-or "modpython", nor may "mod_python" or "modpython" appear in their
-names without prior written permission of Gregory Trubetskoy.
+Products derived from this software may not be called "Apache",
+"mod_python", or "modpython", nor may these terms appear in their
+name, without prior written permission of the Apache Software
+Foundation.
\end{enumerate}
-THIS SOFTWARE IS PROVIDED BY GREGORY TRUBETSKOY ``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 GREGORY TRUBETSKOY OR
-HIS 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 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.
+
This software consists of an extension to the Apache http server.
More information about Apache may be found at
Re: cvs commit: httpd-python/Doc copyright.tex
Posted by "Gregory (Grisha) Trubetskoy" <gr...@apache.org>.
Well, the official announcement just went out.
On Thu, 12 Sep 2002, Greg Stein wrote:
> The python-dev@httpd.apache.org and python-cvs@httpd.apache.org mailing
> lists are now operational.
> Migration of the existing mailing lists will be a bit tricky, I'd
> imagine. Not sure of the best way to do that.
It's actually only one list - mod_python@modpython.org. There's never been
any separation between "developer" and "end user" lists.
I'll be MIA at a conference until tomorrow afternoon possibly without net
access, so don't expect much from me until then :)
Grisha
Re: cvs commit: httpd-python/Doc copyright.tex
Posted by Greg Stein <gs...@lyra.org>.
On Thu, Sep 12, 2002 at 12:03:47PM -0700, Aaron Bannert wrote:
> On Thu, Sep 12, 2002 at 06:31:47PM -0000, gstein@apache.org wrote:
> > gstein 2002/09/12 11:31:47
> >
> > Modified: . COPYRIGHT
> > Doc copyright.tex
> > Log:
> > Fix up the copyright files.
>
>
> Cool! Let us know on this list when things are fully transfered (or if
> they already have).
The CVS repository at SourceForge is now dead, so any mod_python dev work
should take place in the httpd-python repository on cvs.apache.org.
The python-dev@httpd.apache.org and python-cvs@httpd.apache.org mailing
lists are now operational. Migration of the existing mailing lists will be a
bit tricky, I'd imagine. Not sure of the best way to do that.
In any case, we're live now :-)
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: httpd-python/Doc copyright.tex
Posted by Aaron Bannert <aa...@clove.org>.
On Thu, Sep 12, 2002 at 06:31:47PM -0000, gstein@apache.org wrote:
> gstein 2002/09/12 11:31:47
>
> Modified: . COPYRIGHT
> Doc copyright.tex
> Log:
> Fix up the copyright files.
Cool! Let us know on this list when things are fully transfered (or if
they already have).
-aaron