[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[georg.brandl]

http://hg.python.org/cpython/rev/2e4fd707201c
changeset:   73849:2e4fd707201c
parent:      73847:a3ddee916808
parent:      73848:0436ef8be253
user:        Georg Brandl <georg at python.org>
date:        Sun Dec 04 11:51:33 2011 +0100
summary:
  Merge with 3.2.

files:
  Doc/tools/sphinxext/static/copybutton.js |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/tools/sphinxext/static/copybutton.js b/Doc/tools/sphinxext/static/copybutton.js
--- a/Doc/tools/sphinxext/static/copybutton.js
+++ b/Doc/tools/sphinxext/static/copybutton.js
@@ -8,8 +8,8 @@
 
     // get the styles from the current theme
     pre.parent().parent().css('position', 'relative');
-    var hide_text = 'Hide the prompts and ouput';
-    var show_text = 'Show the prompts and ouput';
+    var hide_text = 'Hide the prompts and output';
+    var show_text = 'Show the prompts and output';
     var border_width = pre.css('border-top-width');
     var border_style = pre.css('border-top-style');
     var border_color = pre.css('border-top-color');

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