summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-12-04 10:51:33 (GMT)
committerGeorg Brandl <georg@python.org>2011-12-04 10:51:33 (GMT)
commit4d5232ab8af08a3e4ce5ffdb432468c7eeb79e51 (patch)
tree8667f29b72b3cece6d2b3d854e7a68f40823fd16 /Doc
parent7ff21d7a3c934a90e4b9d5058034d7d2d2259f2c (diff)
parent6a96a2e1f8d9eed416d1560534531d8cf61e973c (diff)
downloadcpython-4d5232ab8af08a3e4ce5ffdb432468c7eeb79e51.zip
cpython-4d5232ab8af08a3e4ce5ffdb432468c7eeb79e51.tar.gz
cpython-4d5232ab8af08a3e4ce5ffdb432468c7eeb79e51.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tools/sphinxext/static/copybutton.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tools/sphinxext/static/copybutton.js b/Doc/tools/sphinxext/static/copybutton.js
index 91f8763..a3b1099 100644
--- a/Doc/tools/sphinxext/static/copybutton.js
+++ b/Doc/tools/sphinxext/static/copybutton.js
@@ -8,8 +8,8 @@ $(document).ready(function() {
// 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');