[Python-3000-checkins] r59826 - in python/branches/py3k: Doc/library/collections.rst Doc/library/getopt.rst Doc/library/imp.rst Doc/library/logging.rst Doc/library/socket.rst Doc/library/stdtypes.rst Doc/tutorial/controlflow.rst Doc/tutorial/introduction.rst Lib/abc.py Lib/collections.py Lib/test/test_abc.py Lib/test/test_socket.py Misc/NEWS Misc/developers.txt Modules/socketmodule.c Modules/socketmodule.h Python/future.c configure configure.in pyconfig.h.in

[Christian Heimes]

christian.heimes wrote:
> Author: christian.heimes
> Date: Mon Jan  7 18:19:16 2008
> New Revision: 59826
> 
> Modified:
>    python/branches/py3k/   (props changed)
>    python/branches/py3k/Doc/library/collections.rst
>    python/branches/py3k/Doc/library/getopt.rst
>    python/branches/py3k/Doc/library/imp.rst
>    python/branches/py3k/Doc/library/logging.rst
>    python/branches/py3k/Doc/library/socket.rst
>    python/branches/py3k/Doc/library/stdtypes.rst
>    python/branches/py3k/Doc/tutorial/controlflow.rst
>    python/branches/py3k/Doc/tutorial/introduction.rst
>    python/branches/py3k/Lib/abc.py
>    python/branches/py3k/Lib/collections.py
>    python/branches/py3k/Lib/test/test_abc.py
>    python/branches/py3k/Lib/test/test_socket.py
>    python/branches/py3k/Misc/NEWS
>    python/branches/py3k/Misc/developers.txt
>    python/branches/py3k/Modules/socketmodule.c
>    python/branches/py3k/Modules/socketmodule.h
>    python/branches/py3k/Python/future.c
>    python/branches/py3k/configure
>    python/branches/py3k/configure.in
>    python/branches/py3k/pyconfig.h.in
> Log:
> Copied doc for reload() from trunk's function.rst to imp.rst

Make that a merge from the trunk, too

Merged revisions 59784-59821 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svnmerge-commit-message.txt
Url: http://mail.python.org/pipermail/python-3000-checkins/attachments/20080107/ca617593/attachment.txt