summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin Panter <vadmium>2015-08-31 03:25:34 (GMT)
committerMartin Panter <vadmium>2015-08-31 03:25:34 (GMT)
commite721b7cb8b879a848d47b9716783526c12c341a2 (patch)
tree07ba19ddba18c239cd9db438d2cc289f7c2dbb5d /Misc
parent1498461a7ada7688b347007aa2cc00b857899dff (diff)
parent31e7f50d4cb756927a89d2d33eaf1b5a030be7a9 (diff)
downloadcpython-e721b7cb8b879a848d47b9716783526c12c341a2.zip
cpython-e721b7cb8b879a848d47b9716783526c12c341a2.tar.gz
cpython-e721b7cb8b879a848d47b9716783526c12c341a2.tar.bz2
Issue #24952: Merge 3.4 into 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4318ba7..6b67598 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -914,6 +914,7 @@ Nick Mathewson
Simon Mathieu
Laura Matson
Graham Matthews
+mattip
Martin Matusiak
Dieter Maurer
Daniel May
diff --git a/Misc/NEWS b/Misc/NEWS
index 89b199c..7ff67bf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@ Library
Documentation
-------------
+- Issue #24952: Clarify the default size argument of stack_size() in
+ the "threading" and "_thread" modules. Patch from Mattip.
+
- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
Patch from Zbigniew Jędrzejewski-Szmek.