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

[georg.brandl]

http://hg.python.org/cpython/rev/f2d92da0f28a
changeset:   86295:f2d92da0f28a
parent:      86293:bee6f147813e
parent:      86294:e08dea96b6e2
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 13 10:49:47 2013 +0200
summary:
  merge with 3.3

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


diff --git a/Doc/library/winsound.rst b/Doc/library/winsound.rst
--- a/Doc/library/winsound.rst
+++ b/Doc/library/winsound.rst
@@ -126,6 +126,10 @@
 
    Return immediately if the sound driver is busy.
 
+   .. note::
+
+      This flag is not supported on modern Windows platforms.
+
 
 .. data:: MB_ICONASTERISK
 

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