merge with 3.3

434bdf41 · Georg Brandl · 94c1467b · 9ad5bf66 · 434bdf41
Commit 434bdf41 authored Oct 06, 2013 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

Doc/library/os.rst Doc/library/os.rst +0 -2

No files found.
--- 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*.