[Python-checkins] cpython (merge 3.4 -> default): Merge typo fix

[zach.ware]

http://hg.python.org/cpython/rev/1e74350dd056
changeset:   91264:1e74350dd056
parent:      91262:c9bee963557b
parent:      91263:4cf322536328
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jun 17 22:27:46 2014 -0500
summary:
  Merge typo fix

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


diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -407,7 +407,7 @@
    (silent) to 100 (full volume).  If the control is monophonic, a 2-tuple is still
    returned, but both volumes are the same.
 
-   Raises :exc:`OSSAudioError` if an invalid control was is specified, or
+   Raises :exc:`OSSAudioError` if an invalid control is specified, or
    :exc:`OSError` if an unsupported control is specified.
 
 

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