From: Pablo Galindo <Pablogsal@gmail.com>
Date: Tue, 17 Nov 2020 19:57:03 +0000 (+0000)
Subject: bpo-41625: Specify that Linux >= 2.6.17 *and* glibc >= 2.5 are requir… (GH-23351)
X-Git-Tag: v3.10.0a3~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59958f8b6815f51f6c33b6a613cf8467ca18a11;p=thirdparty%2FPython%2Fcpython.git

bpo-41625: Specify that Linux >= 2.6.17 *and* glibc >= 2.5 are requir… (GH-23351)



…ed for splice()
---

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 648c52b4705d..a4c5fbb48152 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1441,7 +1441,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    make sense to block because there are no writers connected to the write end
    of the pipe.
 
-   .. availability:: Linux kernel >= 2.6.17 or glibc >= 2.5
+   .. availability:: Linux kernel >= 2.6.17 and glibc >= 2.5
 
    .. versionadded:: 3.10