Merge from 3.6

This commit is contained in:
Berker Peksag 2016-12-27 15:09:55 +03:00
commit 98feb2a4f5
1 changed files with 2 additions and 2 deletions

View File

@ -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