Closes #25393: Merge with 3.5

zware · zware · commit de85ed69f493 · 2016-07-19T16:46:09.000-05:00
diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
@@ -125,8 +125,7 @@ platform.
 
 .. 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 @@ platform.
 
 .. 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
@@ -1651,6 +1651,7 @@ Xiang Zhang
 Robert Xiao
 Florent Xicluna
 Arnon Yaari
+Alakshendra Yadav
 Hirokazu Yamamoto
 Ka-Ping Yee
 Chi Hsuan Yen
