diff options
author | Barry Warsaw <barry@python.org> | 2012-09-25 14:47:55 (GMT) |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2012-09-25 14:47:55 (GMT) |
commit | d09a05ebc51eb012b87eacdba99ff593d16ec37b (patch) | |
tree | 7aa0d5bb7f3c3fb1e38c51ae37af4e115b9b9149 /Misc | |
parent | dbe508870f9394b2c215795326f2b706f5a9dbca (diff) | |
parent | 1dedd0a4a4b88eeabb95af4b372a447b4d41b223 (diff) | |
download | cpython-d09a05ebc51eb012b87eacdba99ff593d16ec37b.zip cpython-d09a05ebc51eb012b87eacdba99ff593d16ec37b.tar.gz cpython-d09a05ebc51eb012b87eacdba99ff593d16ec37b.tar.bz2 |
Merge 3.2 except the massive Misc/NEWS conflict, so hand apply the NEWS entry.
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -99,6 +99,9 @@ Build Documentation ------------- +- Issue #15935: Clarification of argparse docs, re: add_argument() type and + default arguments. Patch contributed by Chris Jerdonek. + - Issue #11964: Document a change in v3.2 to the behavior of the indent parameter of json encoding operations. |