summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2014-03-01 12:53:28 (GMT)
committerAndrew Kuchling <amk@amk.ca>2014-03-01 12:53:28 (GMT)
commit98f2bbf794013f1d194e219fbacaa99146fd5630 (patch)
tree97ab9d3f612d70549a02b044a7e897f5363cac57 /Doc/library
parent7b96f76dc85a35cc5aa5d33baf43ad882fb54582 (diff)
downloadcpython-98f2bbf794013f1d194e219fbacaa99146fd5630.zip
cpython-98f2bbf794013f1d194e219fbacaa99146fd5630.tar.gz
cpython-98f2bbf794013f1d194e219fbacaa99146fd5630.tar.bz2
#16135: remove mentions of OS/2 from the documentation
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/curses.rst2
-rw-r--r--Doc/library/os.rst3
-rw-r--r--Doc/library/socket.rst3
-rw-r--r--Doc/library/undoc.rst2
4 files changed, 4 insertions, 6 deletions
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 314636e..f3e60b4 100644
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -12,7 +12,7 @@ The :mod:`curses` module provides an interface to the curses library, the
de-facto standard for portable advanced terminal handling.
While curses is most widely used in the Unix environment, versions are available
-for DOS, OS/2, and possibly other systems as well. This extension module is
+for Windows, DOS, and possibly other systems as well. This extension module is
designed to match the API of ncurses, an open-source curses library hosted on
Linux and the BSD variants of Unix.
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 1fc8de9..b98ad80 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2653,7 +2653,7 @@ written in Python, such as a mail server's external command delivery program.
Fork a child process. Return ``0`` in the child and the child's process id in the
parent. If an error occurs :exc:`OSError` is raised.
- Note that some platforms including FreeBSD <= 6.3, Cygwin and OS/2 EMX have
+ Note that some platforms including FreeBSD <= 6.3 and Cygwin have
known issues when using fork() from a thread.
.. warning::
@@ -2899,7 +2899,6 @@ written in Python, such as a mail server's external command delivery program.
:manpage:`times(2)` or the corresponding Windows Platform API documentation.
On Windows, only :attr:`user` and :attr:`system` are known; the other
attributes are zero.
- On OS/2, only :attr:`elapsed` is known; the other attributes are zero.
Availability: Unix, Windows.
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 5bbc7e4..02124d1 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -6,8 +6,7 @@
This module provides access to the BSD *socket* interface. It is available on
-all modern Unix systems, Windows, MacOS, OS/2, and probably additional
-platforms.
+all modern Unix systems, Windows, MacOS, and probably additional platforms.
.. note::
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 80386d2..20830e2 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -20,7 +20,7 @@ These modules are used to implement the :mod:`os.path` module, and are not
documented beyond this mention. There's little need to document these.
:mod:`ntpath`
- --- Implementation of :mod:`os.path` on Win32, Win64, WinCE, and OS/2 platforms.
+ --- Implementation of :mod:`os.path` on Win32, Win64, and WinCE platforms.
:mod:`posixpath`
--- Implementation of :mod:`os.path` on POSIX.