Skip to content

Commit 0165a89

Browse files
grishagrisha
authored and
grisha
committed
New license
1 parent 44f4fc9 commit 0165a89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+714
-2145
lines changed

COPYRIGHT

Lines changed: 3 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,3 @@
1-
/* ====================================================================
2-
* The Apache Software License, Version 1.1
3-
*
4-
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
5-
* reserved.
6-
*
7-
* Redistribution and use in source and binary forms, with or without
8-
* modification, are permitted provided that the following conditions
9-
* are met:
10-
*
11-
* 1. Redistributions of source code must retain the above copyright
12-
* notice, this list of conditions and the following disclaimer.
13-
*
14-
* 2. Redistributions in binary form must reproduce the above copyright
15-
* notice, this list of conditions and the following disclaimer in
16-
* the documentation and/or other materials provided with the
17-
* distribution.
18-
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
21-
* "This product includes software developed by the
22-
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
25-
*
26-
* 4. The names "Apache" and "Apache Software Foundation" must
27-
* not be used to endorse or promote products derived from this
28-
* software without prior written permission. For written
29-
* permission, please contact [email protected].
30-
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "mod_python", or "modpython", nor may these terms appear in their
33-
* name, without prior written permission of the Apache Software
34-
* Foundation.
35-
*
36-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
37-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
38-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
39-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
40-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
42-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
43-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
44-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
45-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
46-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
47-
* SUCH DAMAGE.
48-
* ====================================================================
49-
*
50-
* This software consists of voluntary contributions made by many
51-
* individuals on behalf of the Apache Software Foundation. For more
52-
* information on the Apache Software Foundation, please see
53-
* <http://www.apache.org/>.
54-
*
55-
* Originally developed by Gregory Trubetskoy.
56-
*
57-
*
58-
* This software is based on the original concept as published in the
59-
* book "Internet Programming with Python" by Aaron Watters, Guido van
60-
* Rossum and James C. Ahlstrom, 1996 M&T Books, ISBN: 1-55851-484-8.
61-
* The book and original software is Copyright 1996 by M&T Books.
62-
*
63-
* This software consists of an extension to the Apache http server.
64-
* More information about Apache may be found at:
65-
*
66-
* http://www.apache.org/
67-
*
68-
* More information on Python language can be found at:
69-
*
70-
* http://www.python.org/
71-
*
72-
*/
1+
2+
See LICENSE file.
3+

Doc/Makefile.in

Lines changed: 10 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,16 @@
1-
# ====================================================================
2-
# The Apache Software License, Version 1.1
1+
# Copyright 2004 Apache Software Foundation
32
#
4-
# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
5-
# reserved.
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
66
#
7-
# Redistribution and use in source and binary forms, with or without
8-
# modification, are permitted provided that the following conditions
9-
# are met:
7+
# http://www.apache.org/licenses/LICENSE-2.0
108
#
11-
# 1. Redistributions of source code must retain the above copyright
12-
# notice, this list of conditions and the following disclaimer.
13-
#
14-
# 2. Redistributions in binary form must reproduce the above copyright
15-
# notice, this list of conditions and the following disclaimer in
16-
# the documentation and/or other materials provided with the
17-
# distribution.
18-
#
19-
# 3. The end-user documentation included with the redistribution,
20-
# if any, must include the following acknowledgment:
21-
# "This product includes software developed by the
22-
# Apache Software Foundation (http://www.apache.org/)."
23-
# Alternately, this acknowledgment may appear in the software itself,
24-
# if and wherever such third-party acknowledgments normally appear.
25-
#
26-
# 4. The names "Apache" and "Apache Software Foundation" must
27-
# not be used to endorse or promote products derived from this
28-
# software without prior written permission. For written
29-
# permission, please contact [email protected].
30-
#
31-
# 5. Products derived from this software may not be called "Apache",
32-
# "mod_python", or "modpython", nor may these terms appear in their
33-
# name, without prior written permission of the Apache Software
34-
# Foundation.
35-
#
36-
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
37-
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
38-
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
39-
# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
40-
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41-
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
42-
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
43-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
44-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
45-
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
46-
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
47-
# SUCH DAMAGE.
48-
# ====================================================================
49-
#
50-
# This software consists of voluntary contributions made by many
51-
# individuals on behalf of the Apache Software Foundation. For more
52-
# information on the Apache Software Foundation, please see
53-
# <http://www.apache.org/>.
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
5414
#
5515
# Originally developed by Gregory Trubetskoy.
5616
#

Doc/copyright.tex

Lines changed: 10 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,16 @@
1-
\centerline{\strong{Copyright \copyright\ 2000-2002 Apache Software Foundation. All rights reserved.}}
1+
\centerline{\strong{Copyright \copyright\ 2004 Apache Software Foundation.}}
22

3-
Redistribution and use in source and binary forms, with or without
4-
modification, are permitted provided that the following conditions
5-
are met:
3+
Licensed under the Apache License, Version 2.0 (the ``License''); you
4+
may not use this file except in compliance with the License. You may
5+
obtain a copy of the License at
66

7-
\begin{enumerate}
7+
http://www.apache.org/licenses/LICENSE-2.0
88

9-
\item
10-
Redistributions of source code must retain the above copyright
11-
notice, this list of conditions and the following disclaimer.
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an ``AS IS'' BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
12+
implied. See the License for the specific language governing
13+
permissions and limitations under the License.
1214

13-
\item
14-
Redistributions in binary form must reproduce the above copyright
15-
notice, this list of conditions and the following disclaimer in the
16-
documentation and/or other materials provided with the distribution.
1715

18-
\item
19-
The end-user documentation included with the redistribution, if any,
20-
must include the following acknowledgment: "This product includes
21-
software developed by the Apache Software Foundation
22-
(http://www.apache.org/)." Alternately, this acknowledgment may
23-
appear in the software itself, if and wherever such third-party
24-
acknowledgments normally appear.
25-
26-
\item
27-
The names "Apache" and "Apache Software Foundation" must not be used
28-
to endorse or promote products derived from this software without
29-
prior written permission. For written permission, please contact
30-
31-
32-
\item
33-
Products derived from this software may not be called "Apache",
34-
"mod_python", or "modpython", nor may these terms appear in their
35-
name, without prior written permission of the Apache Software
36-
Foundation.
37-
38-
\end{enumerate}
39-
40-
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
41-
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
42-
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
43-
IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS
44-
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
45-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
46-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
47-
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
48-
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
49-
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
50-
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51-
52-
53-
This software consists of an extension to the Apache http server.
54-
More information about Apache may be found at
55-
56-
http://www.apache.org/
57-
58-
More information on Python language can be found at
59-
60-
http://www.python.org/
6116

0 commit comments

Comments
 (0)