Merged revisions 82871,82960-82961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82871 | georg.brandl | 2010-07-14 10:00:22 +0200 (Mi, 14 Jul 2010) | 1 line
#9258: fix copy-paste errors.
........
r82960 | georg.brandl | 2010-07-19 08:52:35 +0200 (Mo, 19 Jul 2010) | 1 line
Clarify.
........
r82961 | georg.brandl | 2010-07-19 08:57:52 +0200 (Mo, 19 Jul 2010) | 1 line
Clarify :option: description.
........
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index c755a2b..608f4f8 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -66,11 +66,11 @@
Open *file* and return a corresponding stream. If the file cannot be opened,
an :exc:`IOError` is raised.
- *file* is either a string giving the name (and the path if the file isn't
- in the current working directory) of the file to be opened or an integer
- file descriptor of the file to be wrapped. (If a file descriptor is given,
- for example, from :func:`os.fdopen`, it is closed when the returned I/O
- object is closed, unless *closefd* is set to ``False``.)
+ *file* is either a string giving the pathname (absolute or
+ relative to the current working directory) of the file to be opened or
+ an integer file descriptor of the file to be wrapped. (If a file descriptor
+ is given, it is closed when the returned I/O object is closed, unless
+ *closefd* is set to ``False``.)
*mode* is an optional string that specifies the mode in which the file is
opened. It defaults to ``'r'`` which means open for reading in text mode.