summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-07-19 21:41:20 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-07-19 21:41:20 (GMT)
commit48e3f9820623a7a27e1c7edffa840d90c5a25cdd (patch)
treee6e6535f79cd640003ed10fa83b3a882e665af5e
parent221945056da4540506ff2303c07324e60b234e57 (diff)
downloadcpython-48e3f9820623a7a27e1c7edffa840d90c5a25cdd.zip
cpython-48e3f9820623a7a27e1c7edffa840d90c5a25cdd.tar.gz
cpython-48e3f9820623a7a27e1c7edffa840d90c5a25cdd.tar.bz2
Issue #25393: Fix probable copy/paste error in resource docs
Patch by Alakshendra Yadav.
-rw-r--r--Doc/library/resource.rst6
-rw-r--r--Misc/ACKS1
2 files changed, 4 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
diff --git a/Misc/ACKS b/Misc/ACKS
index 897b103..2b32fb8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1632,6 +1632,7 @@ Xiang Zhang
Robert Xiao
Florent Xicluna
Arnon Yaari
+Alakshendra Yadav
Hirokazu Yamamoto
Ka-Ping Yee
Jason Yeo