diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-12 01:32:03 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-12 01:32:03 (GMT) |
| commit | 96f31636f4af949dd0975c9381d284915c9d76f6 (patch) | |
| tree | 61de113ffa9a0011ca4280a208f825dc726b4438 /Doc/reference | |
| parent | 29fd7120e420014d5c32f5864a1d3c19ffa73c7f (diff) | |
| download | cpython-96f31636f4af949dd0975c9381d284915c9d76f6.zip cpython-96f31636f4af949dd0975c9381d284915c9d76f6.tar.gz cpython-96f31636f4af949dd0975c9381d284915c9d76f6.tar.bz2 | |
Merged revisions 58930-58938 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58931 | vinay.sajip | 2007-11-11 15:27:30 +0100 (Sun, 11 Nov 2007) | 1 line
Fixed a bug reported (in private email, by Robert Crida) in logging configuration whereby child loggers of a logger named in a configuration file, which are not themselves named in the configuration, are disabled when the configuration is applied.
........
r58932 | georg.brandl | 2007-11-11 16:16:16 +0100 (Sun, 11 Nov 2007) | 2 lines
Remove duplication of "this".
........
r58935 | christian.heimes | 2007-11-12 02:15:40 +0100 (Mon, 12 Nov 2007) | 2 lines
Added new decorator syntax to property.__doc__
Guido prefers _x over __x.
........
r58936 | christian.heimes | 2007-11-12 02:20:56 +0100 (Mon, 12 Nov 2007) | 2 lines
Fix for #1427: Error in standard module calendar
the prweek() method is still broken and I can't figure out how it suppose to work.
........
r58938 | andrew.kuchling | 2007-11-12 02:25:21 +0100 (Mon, 12 Nov 2007) | 1 line
Re-word sentence
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/introduction.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst index ceb2cf3..6959a77 100644 --- a/Doc/reference/introduction.rst +++ b/Doc/reference/introduction.rst @@ -58,7 +58,7 @@ Jython Python for .NET This implementation actually uses the CPython implementation, but is a managed - .NET application and makes .NET libraries available. This was created by Brian + .NET application and makes .NET libraries available. It was created by Brian Lloyd. For more information, see the `Python for .NET home page <http://pythonnet.sourceforge.net>`_. |