summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-07-19 21:46:09 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-07-19 21:46:09 (GMT)
commitde85ed69f4935e639b911606d24d3382ae399b9c (patch)
treed0727a6ea7d900e1004daa01cf087efe051c280c /Doc
parentfe8d9666575284c10b6bf803b9c446523da1d23a (diff)
parent48e3f9820623a7a27e1c7edffa840d90c5a25cdd (diff)
downloadcpython-de85ed69f4935e639b911606d24d3382ae399b9c.zip
cpython-de85ed69f4935e639b911606d24d3382ae399b9c.tar.gz
cpython-de85ed69f4935e639b911606d24d3382ae399b9c.tar.bz2
Closes #25393: Merge with 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/resource.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
index b213793..bdfe5f6 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