diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 12:26:19 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 12:26:19 (GMT) |
| commit | d80344f8d3dec44c3045964c4f5a7710a502bdf5 (patch) | |
| tree | df8ca536cab9e081535d403e49b4914e8e0b628b /Doc | |
| parent | a85ee5cfb612e5933c9ef2eb0b24a103acc14ef7 (diff) | |
| download | cpython-d80344f8d3dec44c3045964c4f5a7710a502bdf5.zip cpython-d80344f8d3dec44c3045964c4f5a7710a502bdf5.tar.gz cpython-d80344f8d3dec44c3045964c4f5a7710a502bdf5.tar.bz2 | |
Merged revisions 74055 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
(Selected changes only.)
................
r74055 | alexandre.vassalotti | 2009-07-17 11:18:18 +0200 (Fr, 17 Jul 2009) | 55 lines
Merged revisions 73995,74002,74005,74007-74008,74011,74019-74023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74008 | benjamin.peterson | 2009-07-14 20:46:42 -0400 (Tue, 14 Jul 2009) | 1 line
update year
........
r74011 | ezio.melotti | 2009-07-15 13:07:04 -0400 (Wed, 15 Jul 2009) | 1 line
methods' names pep8ification
........
r74019 | amaury.forgeotdarc | 2009-07-15 17:29:27 -0400 (Wed, 15 Jul 2009) | 2 lines
#6076 Add a title to the IDLE Preferences window.
........
r74020 | georg.brandl | 2009-07-16 03:18:07 -0400 (Thu, 16 Jul 2009) | 1 line
#5910: fix kqueue for calls with more than one event.
........
r74021 | georg.brandl | 2009-07-16 03:33:04 -0400 (Thu, 16 Jul 2009) | 1 line
#6486: start with built in functions rather than "built in objects".
........
r74022 | georg.brandl | 2009-07-16 03:38:35 -0400 (Thu, 16 Jul 2009) | 1 line
#6481: fix typo in os.system() replacement.
........
r74023 | jesse.noller | 2009-07-16 10:23:04 -0400 (Thu, 16 Jul 2009) | 1 line
Issue 6433: multiprocessing.pool.map hangs on empty list
........
................
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/copyright.rst | 2 | ||||
| -rw-r--r-- | Doc/library/intro.rst | 5 | ||||
| -rw-r--r-- | Doc/library/subprocess.rst | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 376b1c4..ec78a38 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright Python and this documentation is: -Copyright © 2001-2008 Python Software Foundation. All rights reserved. +Copyright © 2001-2009 Python Software Foundation. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved. diff --git a/Doc/library/intro.rst b/Doc/library/intro.rst index ce1691d..a0f2d63 100644 --- a/Doc/library/intro.rst +++ b/Doc/library/intro.rst @@ -43,8 +43,9 @@ browse the table of contents (in front of the manual), or look for a specific function, module or term in the index (in the back). And finally, if you enjoy learning about random subjects, you choose a random page number (see module :mod:`random`) and read a section or two. Regardless of the order in which you -read the sections of this manual, it helps to start with chapter :ref:`builtin`, -as the remainder of the manual assumes familiarity with this material. +read the sections of this manual, it helps to start with chapter +:ref:`built-in-funcs`, as the remainder of the manual assumes familiarity with +this material. Let the show begin! diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index bf4ead7..2af5489 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -424,7 +424,7 @@ Replacing :func:`os.system` sts = os.system("mycmd" + " myarg") ==> p = Popen("mycmd" + " myarg", shell=True) - sts = os.waitpid(p.pid, 0) + sts = os.waitpid(p.pid, 0)[1] Notes: |