Georg Brandl ab32fec83c Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from ... svn+ssh://svn.python.org/python/branches/py3k ........ r85572 | georg.brandl | 2010-10-16 20:51:05 +0200 (Sa, 16 Okt 2010) | 1 line #10122: typo fix. ........ r85573 | georg.brandl | 2010-10-16 20:53:08 +0200 (Sa, 16 Okt 2010) | 1 line #10124: typo fix. ........ r85606 | georg.brandl | 2010-10-17 08:32:59 +0200 (So, 17 Okt 2010) | 1 line #10058: tweak wording about exception returns. ........ r85609 | georg.brandl | 2010-10-17 11:19:03 +0200 (So, 17 Okt 2010) | 1 line #8556: use less confusing mapping key in example. ........ r85610 | georg.brandl | 2010-10-17 11:23:05 +0200 (So, 17 Okt 2010) | 1 line #8686: remove potentially confusing wording that does not add any value. ........ r85611 | georg.brandl | 2010-10-17 11:33:24 +0200 (So, 17 Okt 2010) | 1 line #8811: small fixes to sqlite3 docs. ........ r85612 | georg.brandl | 2010-10-17 11:37:54 +0200 (So, 17 Okt 2010) | 1 line #8855: add shelve security warning. ........ r85613 | georg.brandl | 2010-10-17 11:43:35 +0200 (So, 17 Okt 2010) | 1 line Fix hmac docs: it takes and returns bytes, except for hexdigest(). ........ r85614 | georg.brandl | 2010-10-17 11:46:11 +0200 (So, 17 Okt 2010) | 1 line #8968: add actual name of token constants. ........ r85615 | georg.brandl | 2010-10-17 12:05:13 +0200 (So, 17 Okt 2010) | 1 line #459007: merge info from PC/getpathp.c and using/windows.rst to document the forming of sys.path under Windows. ........ r85616 | georg.brandl | 2010-10-17 12:07:29 +0200 (So, 17 Okt 2010) | 1 line Fix copy-paste error in example. ........ r85617 | georg.brandl | 2010-10-17 12:09:06 +0200 (So, 17 Okt 2010) | 1 line #5212: md5 weaknesses do not affect hmac, so remove the note about that. ........ r85618 | georg.brandl | 2010-10-17 12:14:38 +0200 (So, 17 Okt 2010) | 1 line #9086: correct wrong terminology about linking with pythonXY.dll. ........ r85619 | georg.brandl | 2010-10-17 12:15:50 +0200 (So, 17 Okt 2010) | 1 line Make file names consistent. ........ r85620 | georg.brandl | 2010-10-17 12:22:28 +0200 (So, 17 Okt 2010) | 1 line Remove second parser module example; it referred to non-readily-available example files, and this kind of discovery is much better done with the AST nowadays anyway. ........ r85621 | georg.brandl | 2010-10-17 12:24:54 +0200 (So, 17 Okt 2010) | 1 line #9105: move pickle warning to a bit more prominent location. ........ r85622 | georg.brandl | 2010-10-17 12:28:04 +0200 (So, 17 Okt 2010) | 1 line #9112: document error() and exit() methods of ArgumentParser. ........ r85624 | georg.brandl | 2010-10-17 12:34:28 +0200 (So, 17 Okt 2010) | 1 line Some markup and style fixes in argparse docs. ........ r85626 | georg.brandl | 2010-10-17 12:38:20 +0200 (So, 17 Okt 2010) | 1 line #9117: fix syntax for class definition. ........ r85627 | georg.brandl | 2010-10-17 12:44:11 +0200 (So, 17 Okt 2010) | 1 line #9138: reword introduction to classes in Python. ........ r85629 | georg.brandl | 2010-10-17 12:51:45 +0200 (So, 17 Okt 2010) | 1 line #5962: clarify sys.exit() vs. threads. ........ r85631 | georg.brandl | 2010-10-17 12:53:54 +0200 (So, 17 Okt 2010) | 1 line Fix capitalization. ........ r85633 | georg.brandl | 2010-10-17 12:59:41 +0200 (So, 17 Okt 2010) | 1 line #9204: remove mentions of removed types in the types module. ........ r85635 | georg.brandl | 2010-10-17 13:03:22 +0200 (So, 17 Okt 2010) | 1 line #5121: fix claims about default values leading to segfaults. ........ r85636 | georg.brandl | 2010-10-17 13:06:14 +0200 (So, 17 Okt 2010) | 1 line #9237: document sys.call_tracing(). ........ r85638 | georg.brandl | 2010-10-17 13:13:37 +0200 (So, 17 Okt 2010) | 1 line Port changes to pickle docs apparently lost in py3k. ........ r85639 | georg.brandl | 2010-10-17 13:23:56 +0200 (So, 17 Okt 2010) | 1 line Make twisted example a bit more logical. ........ r85641 | georg.brandl | 2010-10-17 13:29:07 +0200 (So, 17 Okt 2010) | 1 line Fix documentation of dis.opmap direction. ........ r85642 | georg.brandl | 2010-10-17 13:36:28 +0200 (So, 17 Okt 2010) | 1 line #9730: fix example. ........		2010-11-26 08:49:15 +00:00
..
abstract.rst	Merged revisions 85082 via svnmerge from	2010-09-28 23:41:31 +00:00
allocation.rst	After discussing some more with Georg, do no migrate versionchanged:: 2.5 to	2009-04-27 08:07:12 +00:00
arg.rst	Merged revisions 84945 via svnmerge from	2010-10-06 08:56:53 +00:00
bool.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
buffer.rst	Merged revisions 76923,76926,77009,77082-77083,77085,77087,77121 via svnmerge from	2010-10-06 07:17:29 +00:00
bytearray.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
bytes.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
capsule.rst	#5946: fix speling.	2009-05-06 08:32:17 +00:00
cell.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
cobject.rst	add a replacement API for PyCObject, PyCapsule #5630	2009-05-05 22:31:58 +00:00
complex.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
concrete.rst	Merged revisions 85084 via svnmerge from	2010-09-29 00:01:41 +00:00
conversion.rst	Merged revisions 75977 via svnmerge from	2009-10-31 09:40:56 +00:00
datetime.rst	Merged revisions 82255 via svnmerge from	2010-06-26 18:58:29 +00:00
descriptor.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
dict.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
exceptions.rst	Merged revisions 78959,79170,79175,79177,79180,79183,79186,79193,79581 via svnmerge from	2010-10-06 07:59:52 +00:00
file.rst	Merged revisions 82000-82001 via svnmerge from	2010-06-15 17:31:05 +00:00
float.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
function.rst	Mention the behaviour of PyFunction_SetAnnotations() on error.	2008-07-13 22:28:42 +00:00
gcsupport.rst	Merged revisions 78959,79170,79175,79177,79180,79183,79186,79193,79581 via svnmerge from	2010-10-06 07:59:52 +00:00
gen.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
import.rst	Recorded merge of revisions 74057 via svnmerge from	2009-08-13 12:13:42 +00:00
index.rst	Fix two oversights in C API split.	2008-01-20 11:00:14 +00:00
init.rst	Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from	2010-11-26 08:42:45 +00:00
intro.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
iter.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
iterator.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
list.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
long.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
mapping.rst	Merged revisions 74762 via svnmerge from	2009-09-13 08:08:32 +00:00
marshal.rst	After discussing some more with Georg, do no migrate versionchanged:: 2.5 to	2009-04-27 08:07:12 +00:00
memory.rst	Merged revisions 65182 via svnmerge from	2008-07-23 16:13:07 +00:00
memoryview.rst	Merged revisions 85084 via svnmerge from	2010-09-29 00:01:41 +00:00
method.rst	Merged revisions 73941-73943,74076,74094,74186,74211-74214,74247,74254,74262,74311,74334,74368 via svnmerge from	2009-08-13 08:26:44 +00:00
module.rst	#4614: document PyModule_Create and PyModuleDef struct.	2009-01-04 23:20:14 +00:00
none.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
number.rst	#6115: remove entries for the already removed PyNumber_Divide and PyNumber_InPlaceDivide from the header and the docs.	2009-05-26 16:43:13 +00:00
objbuffer.rst	Merged revisions 85082 via svnmerge from	2010-09-28 23:41:31 +00:00
object.rst	After discussing some more with Georg, do no migrate versionchanged:: 2.5 to	2009-04-27 08:07:12 +00:00
objimpl.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
refcounting.rst	Merged revisions 59333-59370 via svnmerge from	2007-12-05 20:18:38 +00:00
reflection.rst	Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from	2010-10-06 07:12:17 +00:00
sequence.rst	Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from	2009-06-01 22:42:33 +00:00
set.rst	After discussing some more with Georg, do no migrate versionchanged:: 2.5 to	2009-04-27 08:07:12 +00:00
slice.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
structures.rst	Merged revisions 77273 via svnmerge from	2010-01-03 09:12:58 +00:00
sys.rst	Merged revisions 73941-73943,74076,74094,74186,74211-74214,74247,74254,74262,74311,74334,74368 via svnmerge from	2009-08-13 08:26:44 +00:00
tuple.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
type.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
typeobj.rst	Merged revisions 78959,79170,79175,79177,79180,79183,79186,79193,79581 via svnmerge from	2010-10-06 07:59:52 +00:00
unicode.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
utilities.rst	Split C API docs in Py3k branch.	2008-01-20 09:30:57 +00:00
veryhigh.rst	Merged revisions 85572-85573,85606,85609-85622,85624,85626-85627,85629,85631,85633,85635-85636,85638-85639,85641-85642 via svnmerge from	2010-11-26 08:49:15 +00:00
weakref.rst	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00