[Python-checkins] cpython (merge 3.5 -> default): Closes #25393: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/829117ae2e55
changeset:   102411:829117ae2e55
parent:      102408:d87f30c29ad4
parent:      102410:0fe2b7509707
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jul 19 16:46:09 2016 -0500
summary:
  Closes #25393: Merge with 3.5

files:
  Doc/library/resource.rst |  6 +++---
  Misc/ACKS                |  1 +
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
--- a/Doc/library/resource.rst
+++ b/Doc/library/resource.rst
@@ -125,8 +125,7 @@
 
 .. data:: RLIMIT_FSIZE
 
-   The maximum size of a file which the process may create.  This only affects the
-   stack of the main thread in a multi-threaded process.
+   The maximum size of a file which the process may create.
 
 
 .. data:: RLIMIT_DATA
@@ -136,7 +135,8 @@
 
 .. data:: RLIMIT_STACK
 
-   The maximum size (in bytes) of the call stack for the current process.
+   The maximum size (in bytes) of the call stack for the current process.  This only
+   affects the stack of the main thread in a multi-threaded process.
 
 
 .. data:: RLIMIT_RSS
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1651,6 +1651,7 @@
 Robert Xiao
 Florent Xicluna
 Arnon Yaari
+Alakshendra Yadav
 Hirokazu Yamamoto
 Ka-Ping Yee
 Chi Hsuan Yen

-- 
Repository URL: https://hg.python.org/cpython