summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-24 17:24:27 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-24 17:24:27 (GMT)
commit7543997d74785910d80e96491f7ff052c5056515 (patch)
treec2ee9cba6ac52483f990f52c0e4bbd7a9896928e /Doc/library
parente8ddbece0f8beaa5d8e13af9d7fd71bf49ddd3e4 (diff)
downloadcpython-7543997d74785910d80e96491f7ff052c5056515.zip
cpython-7543997d74785910d80e96491f7ff052c5056515.tar.gz
cpython-7543997d74785910d80e96491f7ff052c5056515.tar.bz2
#6677: mention "deleting" as an alias for removing files.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/os.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 01118de..cab2522 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1067,12 +1067,12 @@ Files and Directories
.. function:: remove(path)
- Remove the file *path*. If *path* is a directory, :exc:`OSError` is raised; see
- :func:`rmdir` below to remove a directory. This is identical to the
- :func:`unlink` function documented below. On Windows, attempting to remove a
- file that is in use causes an exception to be raised; on Unix, the directory
- entry is removed but the storage allocated to the file is not made available
- until the original file is no longer in use. Availability: Unix,
+ Remove (delete) the file *path*. If *path* is a directory, :exc:`OSError` is
+ raised; see :func:`rmdir` below to remove a directory. This is identical to
+ the :func:`unlink` function documented below. On Windows, attempting to
+ remove a file that is in use causes an exception to be raised; on Unix, the
+ directory entry is removed but the storage allocated to the file is not made
+ available until the original file is no longer in use. Availability: Unix,
Windows.
@@ -1297,9 +1297,9 @@ Files and Directories
.. function:: unlink(path)
- Remove the file *path*. This is the same function as :func:`remove`; the
- :func:`unlink` name is its traditional Unix name. Availability: Unix,
- Windows.
+ Remove (delete) the file *path*. This is the same function as
+ :func:`remove`; the :func:`unlink` name is its traditional Unix
+ name. Availability: Unix, Windows.
.. function:: utime(path, times)