[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/b3846ba353a1
changeset:   86092:b3846ba353a1
parent:      86090:50e4d0c62c2b
parent:      86091:ef5aa8d7e932
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 18:12:13 2013 +0200
summary:
  merge with 3.3

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


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1868,8 +1868,8 @@
    On some Unix systems (such as Linux), the following attributes may also be
    available:
 
-   * :attr:`st_blocks` - number of blocks allocated for file
-   * :attr:`st_blksize` - filesystem blocksize
+   * :attr:`st_blocks` - number of 512-byte blocks allocated for file
+   * :attr:`st_blksize` - filesystem blocksize for efficient file system I/O
    * :attr:`st_rdev` - type of device if an inode device
    * :attr:`st_flags` - user defined flags for file
 

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