summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2016-09-11 14:16:58 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2016-09-11 14:16:58 (GMT)
commitd5ee406ff1426b4e9cfb9a8d8e5b1d43fb9607b2 (patch)
tree1e4613a2fd387fe974a69f2090690258809a4248 /Doc
parentb5690864baf4fce678d80639a6ed9e239bc0065a (diff)
parente4946e73c88ef5381382788800e9a287daaaf7dc (diff)
downloadcpython-d5ee406ff1426b4e9cfb9a8d8e5b1d43fb9607b2.zip
cpython-d5ee406ff1426b4e9cfb9a8d8e5b1d43fb9607b2.tar.gz
cpython-d5ee406ff1426b4e9cfb9a8d8e5b1d43fb9607b2.tar.bz2
Closes #23105: Merged update from 3.5.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/os.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index e2b6e64..111ddad 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -948,7 +948,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
O_EXCL
O_TRUNC
- These constants are available on Unix and Windows.
+ The above constants are available on Unix and Windows.
.. data:: O_DSYNC
@@ -957,11 +957,9 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
O_NDELAY
O_NONBLOCK
O_NOCTTY
- O_SHLOCK
- O_EXLOCK
O_CLOEXEC
- These constants are only available on Unix.
+ The above constants are only available on Unix.
.. versionchanged:: 3.3
Add :data:`O_CLOEXEC` constant.
@@ -974,7 +972,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
O_SEQUENTIAL
O_TEXT
- These constants are only available on Windows.
+ The above constants are only available on Windows.
.. data:: O_ASYNC
@@ -984,8 +982,10 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
O_NOATIME
O_PATH
O_TMPFILE
+ O_SHLOCK
+ O_EXLOCK
- These constants are GNU extensions and not present if they are not defined by
+ The above constants are extensions and not present if they are not defined by
the C library.
.. versionchanged:: 3.4