summaryrefslogtreecommitdiffstats
path: root/Doc/license.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-07-28 20:56:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-07-28 20:56:24 (GMT)
commitee19c772cb5795cb3e435a6f85634f05bf3248a4 (patch)
tree7d1b6e8a04a696191839825ed756d7aa26808a40 /Doc/license.rst
parent8cdc40e3b0622ea4eeb8b2c9b0e6796be685d16d (diff)
downloadcpython-ee19c772cb5795cb3e435a6f85634f05bf3248a4.zip
cpython-ee19c772cb5795cb3e435a6f85634f05bf3248a4.tar.gz
cpython-ee19c772cb5795cb3e435a6f85634f05bf3248a4.tar.bz2
Remove mentions of previous license in profile module docs (#12417 followup).
Also remove an extra docstring.
Diffstat (limited to 'Doc/license.rst')
-rw-r--r--Doc/license.rst30
1 files changed, 0 insertions, 30 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index a4f0994..f45f0ae 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -489,36 +489,6 @@ The :mod:`http.cookies` module contains the following notice::
PERFORMANCE OF THIS SOFTWARE.
-Profiling
----------
-
-The :mod:`profile` and :mod:`pstats` modules contain the following notice::
-
- Copyright 1994, by InfoSeek Corporation, all rights reserved.
- Written by James Roskind
-
- Permission to use, copy, modify, and distribute this Python software
- and its associated documentation for any purpose (subject to the
- restriction in the following sentence) without fee is hereby granted,
- provided that the above copyright notice appears in all copies, and
- that both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of InfoSeek not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission. This permission is
- explicitly restricted to the copying and modification of the software
- to remain in Python, compiled Python, or other languages (such as C)
- wherein the modified or derived code is exclusively imported into a
- Python module.
-
- INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
Execution tracing
-----------------