[Python-checkins] cpython (merge 3.1 -> 3.2): Merge #12228

[mark.dickinson]

http://hg.python.org/cpython/rev/4a3e528b6b11
changeset:   70962:4a3e528b6b11
branch:      3.2
parent:      70957:96ce58d2d6bd
parent:      70961:03c8de42c206
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Jun 25 12:04:08 2011 +0200
summary:
  Merge #12228

files:
  Doc/library/stat.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/stat.rst b/Doc/library/stat.rst
--- a/Doc/library/stat.rst
+++ b/Doc/library/stat.rst
@@ -307,11 +307,11 @@
 
    The file may only be appended to.
 
-.. data:: UF_OPAQUE
+.. data:: UF_NOUNLINK
 
    The file may not be renamed or deleted.
 
-.. data:: UF_NOUNLINK
+.. data:: UF_OPAQUE
 
    The directory is opaque when viewed through a union stack.
 

-- 
Repository URL: http://hg.python.org/cpython