diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 16:58:03 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 16:58:03 (GMT) |
| commit | 434bdf413ff78fe23127da23f267dd0e18d633e8 (patch) | |
| tree | e82202618b9ae1914d2382647a35f47fac552c47 /Doc | |
| parent | 94c1467badeec8ce59f0ee5bbd6c8debb343df98 (diff) | |
| parent | 9ad5bf662db7d209e661663db13b41670fafb376 (diff) | |
| download | cpython-434bdf413ff78fe23127da23f267dd0e18d633e8.zip cpython-434bdf413ff78fe23127da23f267dd0e18d633e8.tar.gz cpython-434bdf413ff78fe23127da23f267dd0e18d633e8.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/os.rst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index a092413..246527d 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2159,8 +2159,6 @@ features: - If *times* and *ns* are both ``None``, this is equivalent to specifying ``ns=(atime_ns, mtime_ns)`` where both times are the current time. - (The effect is similar to running the Unix program - :program:`touch` on *path*.) It is an error to specify tuples for both *times* and *ns*. |