diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-07-19 16:46:09 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-07-19 16:46:09 -0500 |
| commit | de85ed69f4935e639b911606d24d3382ae399b9c (patch) | |
| tree | d0727a6ea7d900e1004daa01cf087efe051c280c | |
| parent | fe8d9666575284c10b6bf803b9c446523da1d23a (diff) | |
| parent | 48e3f9820623a7a27e1c7edffa840d90c5a25cdd (diff) | |
| download | cpython-git-de85ed69f4935e639b911606d24d3382ae399b9c.tar.gz | |
Closes #25393: Merge with 3.5
| -rw-r--r-- | Doc/library/resource.rst | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst index b213793a2c..bdfe5f6d45 100644 --- 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 @@ -1651,6 +1651,7 @@ Xiang Zhang Robert Xiao Florent Xicluna Arnon Yaari +Alakshendra Yadav Hirokazu Yamamoto Ka-Ping Yee Chi Hsuan Yen |