[Python-checkins] cpython (merge 3.5 -> 3.6): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/6508f7b98523
changeset:   104074:6508f7b98523
branch:      3.6
parent:      104071:927a08d380c7
parent:      104073:413962973ea6
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Sep 26 22:50:32 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/library/os.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1804,6 +1804,8 @@
    This function can also support :ref:`paths relative to directory descriptors
    <dir_fd>`.
 
+   Availability: Unix.
+
    .. versionadded:: 3.3
       The *dir_fd* argument.
 

-- 
Repository URL: https://hg.python.org/cpython