summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-12-27 12:09:55 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-12-27 12:09:55 (GMT)
commit98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9 (patch)
tree5ed5577e91f78ad082e5ba19a3fc703f54f262ed
parentfd54a74539c9fb813d1fc3cdc206e35338525baf (diff)
parentfe607beef73b4bfc60f4ce2e4e668c1cf2b99d5a (diff)
downloadcpython-98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9.zip
cpython-98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9.tar.gz
cpython-98feb2a4f55bb7d2f37a065fbd8d9195c4807bd9.tar.bz2
Merge from 3.6
-rw-r--r--Doc/library/shutil.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 3451597..a85bf33 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -625,8 +625,6 @@ The resulting archive contains:
Querying the size of the output terminal
----------------------------------------
-.. versionadded:: 3.3
-
.. function:: get_terminal_size(fallback=(columns, lines))
Get the size of the terminal window.
@@ -650,6 +648,8 @@ Querying the size of the output terminal
See also: The Single UNIX Specification, Version 2,
`Other Environment Variables`_.
+ .. versionadded:: 3.3
+
.. _`Other Environment Variables`:
http://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html#tag_002_003