Merge 3.2.1rc1 release changes to default.

This commit is contained in:
Georg Brandl 2011-05-21 19:43:36 +02:00
commit fb2473fc8b
4 changed files with 121 additions and 11 deletions

View file

@ -386,3 +386,112 @@ whatsnew/3.2,,:cafe,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
whatsnew/3.2,,:affe,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
whatsnew/3.2,,:deaf,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
whatsnew/3.2,,:feed,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
documenting/markup,33,.. sectionauthor:,.. sectionauthor:: Guido van Rossum <guido@python.org>
documenting/markup,42,:mod,:mod:`parrot` -- Dead parrot access
documenting/markup,42,`,:mod:`parrot` -- Dead parrot access
documenting/markup,42,.. module:,.. module:: parrot
documenting/markup,42,:platform,":platform: Unix, Windows"
documenting/markup,42,:synopsis,:synopsis: Analyze and reanimate dead parrots.
documenting/markup,42,.. moduleauthor:,.. moduleauthor:: Eric Cleese <eric@python.invalid>
documenting/markup,42,.. moduleauthor:,.. moduleauthor:: John Idle <john@python.invalid>
documenting/markup,88,:noindex,:noindex:
documenting/markup,95,.. function:,.. function:: spam(eggs)
documenting/markup,95,:noindex,:noindex:
documenting/markup,101,.. method:,.. method:: FileInput.input(...)
documenting/markup,121,:function,c:function
documenting/markup,121,.. c:,".. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)"
documenting/markup,121,::,".. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)"
documenting/markup,131,:member,c:member
documenting/markup,131,.. c:,.. c:member:: PyObject* PyTypeObject.tp_bases
documenting/markup,131,::,.. c:member:: PyObject* PyTypeObject.tp_bases
documenting/markup,139,:macro,c:macro
documenting/markup,143,:type,c:type
documenting/markup,150,:var,c:var
documenting/markup,150,.. cvar:,.. cvar:: PyObject* PyClass_Type
documenting/markup,179,.. function:,".. function:: repeat([repeat=3[, number=1000000]])"
documenting/markup,210,.. decorator:,.. decorator:: removename
documenting/markup,210,.. decorator:,.. decorator:: setnewname(name)
documenting/markup,210,:func,:func:
documenting/markup,237,.. class:,.. class:: Spam
documenting/markup,237,.. data:,.. data:: ham
documenting/markup,237,.. data:,.. data:: Spam.eggs
documenting/markup,250,:meth,:meth:
documenting/markup,263,.. cmdoption:,.. cmdoption:: -m <module>
documenting/markup,281,.. describe:,.. describe:: opcode
documenting/markup,310,.. highlightlang:,.. highlightlang:: c
documenting/markup,330,.. literalinclude:,.. literalinclude:: example.py
documenting/markup,345,:rolename,:rolename:`content`
documenting/markup,345,`,:rolename:`content`
documenting/markup,350,:role,:role:`title <target>`
documenting/markup,350,`,:role:`title <target>`
documenting/markup,356,:meth,:meth:`~Queue.Queue.get`
documenting/markup,356,`,:meth:`~Queue.Queue.get`
documenting/markup,404,:func,:func:`filter`
documenting/markup,404,`,:func:`filter`
documenting/markup,404,:func,:func:`foo.filter`
documenting/markup,404,`,:func:`foo.filter`
documenting/markup,410,:func,:func:`open`
documenting/markup,410,`,:func:`open`
documenting/markup,410,:func,:func:`.open`
documenting/markup,410,`,:func:`.open`
documenting/markup,426,:data,c:data
documenting/markup,430,:func,c:func
documenting/markup,434,:macro,c:macro
documenting/markup,438,:type,c:type
documenting/markup,443,:member,c:member
documenting/markup,493,:file,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
documenting/markup,493,`,... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
documenting/markup,512,:kbd,:kbd:`C-x C-f`
documenting/markup,512,`,:kbd:`C-x C-f`
documenting/markup,512,:kbd,:kbd:`Control-x Control-f`
documenting/markup,512,`,:kbd:`Control-x Control-f`
documenting/markup,526,:mailheader,:mailheader:`Content-Type`
documenting/markup,526,`,:mailheader:`Content-Type`
documenting/markup,535,:manpage,:manpage:`ls(1)`
documenting/markup,535,`,:manpage:`ls(1)`
documenting/markup,551,:menuselection,:menuselection:`Start --> Programs`
documenting/markup,551,`,:menuselection:`Start --> Programs`
documenting/markup,566,`,``code``
documenting/markup,585,:file,:file:
documenting/markup,585,`,``code``
documenting/markup,615,:ref,:ref:`label-name`
documenting/markup,615,`,:ref:`label-name`
documenting/markup,619,:ref,"It refers to the section itself, see :ref:`my-reference-label`."
documenting/markup,619,`,"It refers to the section itself, see :ref:`my-reference-label`."
documenting/markup,628,:ref,:ref:
documenting/markup,630,:ref,:ref:`link text <reference-label>`
documenting/markup,630,`,:ref:`link text <reference-label>`
documenting/markup,651,.. note:,.. note::
documenting/markup,678,.. versionadded:,.. versionadded:: 3.1
documenting/markup,703,::,.. impl-detail::
documenting/markup,703,::,.. impl-detail:: This shortly mentions an implementation detail.
documenting/markup,723,.. seealso:,.. seealso::
documenting/markup,723,:mod,Module :mod:`zipfile`
documenting/markup,723,`,Module :mod:`zipfile`
documenting/markup,723,:mod,Documentation of the :mod:`zipfile` standard module.
documenting/markup,723,`,Documentation of the :mod:`zipfile` standard module.
documenting/markup,723,`,"`GNU tar manual, Basic Tar Format <http://link>`_"
documenting/markup,737,.. centered:,.. centered::
documenting/markup,782,.. toctree:,.. toctree::
documenting/markup,782,:maxdepth,:maxdepth: 2
documenting/markup,798,.. index:,.. index::
documenting/markup,828,.. index:,".. index:: BNF, grammar, syntax, notation"
documenting/markup,859,`,"unaryneg ::= ""-"" `integer`"
documenting/markup,864,.. productionlist:,.. productionlist::
documenting/markup,864,`,"try1_stmt: ""try"" "":"" `suite`"
documenting/markup,864,`,": (""except"" [`expression` ["","" `target`]] "":"" `suite`)+"
documenting/markup,864,`,": [""else"" "":"" `suite`]"
documenting/markup,864,`,": [""finally"" "":"" `suite`]"
documenting/markup,864,`,"try2_stmt: ""try"" "":"" `suite`"
documenting/markup,864,`,": ""finally"" "":"" `suite`"
library/pprint,209,::,"'classifiers': ['Development Status :: 4 - Beta',"
library/pprint,209,::,"'Intended Audience :: Developers',"
library/pprint,209,::,"'License :: OSI Approved :: MIT License',"
library/pprint,209,::,"'Natural Language :: English',"
library/pprint,209,::,"'Operating System :: OS Independent',"
library/pprint,209,::,"'Programming Language :: Python',"
library/pprint,209,::,"'Programming Language :: Python :: 2',"
library/pprint,209,::,"'Programming Language :: Python :: 2.6',"
library/pprint,209,::,"'Programming Language :: Python :: 2.7',"
library/pprint,209,::,"'Topic :: Software Development :: Libraries',"
library/pprint,209,::,"'Topic :: Software Development :: Libraries :: Python Modules'],"

1 c-api/arg :ref PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
386 whatsnew/3.2 :affe netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',
387 whatsnew/3.2 :deaf netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',
388 whatsnew/3.2 :feed netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',
389 documenting/markup 33 .. sectionauthor: .. sectionauthor:: Guido van Rossum <guido@python.org>
390 documenting/markup 42 :mod :mod:`parrot` -- Dead parrot access
391 documenting/markup 42 ` :mod:`parrot` -- Dead parrot access
392 documenting/markup 42 .. module: .. module:: parrot
393 documenting/markup 42 :platform :platform: Unix, Windows
394 documenting/markup 42 :synopsis :synopsis: Analyze and reanimate dead parrots.
395 documenting/markup 42 .. moduleauthor: .. moduleauthor:: Eric Cleese <eric@python.invalid>
396 documenting/markup 42 .. moduleauthor: .. moduleauthor:: John Idle <john@python.invalid>
397 documenting/markup 88 :noindex :noindex:
398 documenting/markup 95 .. function: .. function:: spam(eggs)
399 documenting/markup 95 :noindex :noindex:
400 documenting/markup 101 .. method: .. method:: FileInput.input(...)
401 documenting/markup 121 :function c:function
402 documenting/markup 121 .. c: .. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
403 documenting/markup 121 :: .. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
404 documenting/markup 131 :member c:member
405 documenting/markup 131 .. c: .. c:member:: PyObject* PyTypeObject.tp_bases
406 documenting/markup 131 :: .. c:member:: PyObject* PyTypeObject.tp_bases
407 documenting/markup 139 :macro c:macro
408 documenting/markup 143 :type c:type
409 documenting/markup 150 :var c:var
410 documenting/markup 150 .. cvar: .. cvar:: PyObject* PyClass_Type
411 documenting/markup 179 .. function: .. function:: repeat([repeat=3[, number=1000000]])
412 documenting/markup 210 .. decorator: .. decorator:: removename
413 documenting/markup 210 .. decorator: .. decorator:: setnewname(name)
414 documenting/markup 210 :func :func:
415 documenting/markup 237 .. class: .. class:: Spam
416 documenting/markup 237 .. data: .. data:: ham
417 documenting/markup 237 .. data: .. data:: Spam.eggs
418 documenting/markup 250 :meth :meth:
419 documenting/markup 263 .. cmdoption: .. cmdoption:: -m <module>
420 documenting/markup 281 .. describe: .. describe:: opcode
421 documenting/markup 310 .. highlightlang: .. highlightlang:: c
422 documenting/markup 330 .. literalinclude: .. literalinclude:: example.py
423 documenting/markup 345 :rolename :rolename:`content`
424 documenting/markup 345 ` :rolename:`content`
425 documenting/markup 350 :role :role:`title <target>`
426 documenting/markup 350 ` :role:`title <target>`
427 documenting/markup 356 :meth :meth:`~Queue.Queue.get`
428 documenting/markup 356 ` :meth:`~Queue.Queue.get`
429 documenting/markup 404 :func :func:`filter`
430 documenting/markup 404 ` :func:`filter`
431 documenting/markup 404 :func :func:`foo.filter`
432 documenting/markup 404 ` :func:`foo.filter`
433 documenting/markup 410 :func :func:`open`
434 documenting/markup 410 ` :func:`open`
435 documenting/markup 410 :func :func:`.open`
436 documenting/markup 410 ` :func:`.open`
437 documenting/markup 426 :data c:data
438 documenting/markup 430 :func c:func
439 documenting/markup 434 :macro c:macro
440 documenting/markup 438 :type c:type
441 documenting/markup 443 :member c:member
442 documenting/markup 493 :file ... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
443 documenting/markup 493 ` ... is installed in :file:`/usr/lib/python2.{x}/site-packages` ...
444 documenting/markup 512 :kbd :kbd:`C-x C-f`
445 documenting/markup 512 ` :kbd:`C-x C-f`
446 documenting/markup 512 :kbd :kbd:`Control-x Control-f`
447 documenting/markup 512 ` :kbd:`Control-x Control-f`
448 documenting/markup 526 :mailheader :mailheader:`Content-Type`
449 documenting/markup 526 ` :mailheader:`Content-Type`
450 documenting/markup 535 :manpage :manpage:`ls(1)`
451 documenting/markup 535 ` :manpage:`ls(1)`
452 documenting/markup 551 :menuselection :menuselection:`Start --> Programs`
453 documenting/markup 551 ` :menuselection:`Start --> Programs`
454 documenting/markup 566 ` ``code``
455 documenting/markup 585 :file :file:
456 documenting/markup 585 ` ``code``
457 documenting/markup 615 :ref :ref:`label-name`
458 documenting/markup 615 ` :ref:`label-name`
459 documenting/markup 619 :ref It refers to the section itself, see :ref:`my-reference-label`.
460 documenting/markup 619 ` It refers to the section itself, see :ref:`my-reference-label`.
461 documenting/markup 628 :ref :ref:
462 documenting/markup 630 :ref :ref:`link text <reference-label>`
463 documenting/markup 630 ` :ref:`link text <reference-label>`
464 documenting/markup 651 .. note: .. note::
465 documenting/markup 678 .. versionadded: .. versionadded:: 3.1
466 documenting/markup 703 :: .. impl-detail::
467 documenting/markup 703 :: .. impl-detail:: This shortly mentions an implementation detail.
468 documenting/markup 723 .. seealso: .. seealso::
469 documenting/markup 723 :mod Module :mod:`zipfile`
470 documenting/markup 723 ` Module :mod:`zipfile`
471 documenting/markup 723 :mod Documentation of the :mod:`zipfile` standard module.
472 documenting/markup 723 ` Documentation of the :mod:`zipfile` standard module.
473 documenting/markup 723 ` `GNU tar manual, Basic Tar Format <http://link>`_
474 documenting/markup 737 .. centered: .. centered::
475 documenting/markup 782 .. toctree: .. toctree::
476 documenting/markup 782 :maxdepth :maxdepth: 2
477 documenting/markup 798 .. index: .. index::
478 documenting/markup 828 .. index: .. index:: BNF, grammar, syntax, notation
479 documenting/markup 859 ` unaryneg ::= "-" `integer`
480 documenting/markup 864 .. productionlist: .. productionlist::
481 documenting/markup 864 ` try1_stmt: "try" ":" `suite`
482 documenting/markup 864 ` : ("except" [`expression` ["," `target`]] ":" `suite`)+
483 documenting/markup 864 ` : ["else" ":" `suite`]
484 documenting/markup 864 ` : ["finally" ":" `suite`]
485 documenting/markup 864 ` try2_stmt: "try" ":" `suite`
486 documenting/markup 864 ` : "finally" ":" `suite`
487 library/pprint 209 :: 'classifiers': ['Development Status :: 4 - Beta',
488 library/pprint 209 :: 'Intended Audience :: Developers',
489 library/pprint 209 :: 'License :: OSI Approved :: MIT License',
490 library/pprint 209 :: 'Natural Language :: English',
491 library/pprint 209 :: 'Operating System :: OS Independent',
492 library/pprint 209 :: 'Programming Language :: Python',
493 library/pprint 209 :: 'Programming Language :: Python :: 2',
494 library/pprint 209 :: 'Programming Language :: Python :: 2.6',
495 library/pprint 209 :: 'Programming Language :: Python :: 2.7',
496 library/pprint 209 :: 'Topic :: Software Development :: Libraries',
497 library/pprint 209 :: 'Topic :: Software Development :: Libraries :: Python Modules'],