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

Mon Jul 4 19:57:39 CEST 2011

http://hg.python.org/cpython/rev/24297278c78d
changeset: 71207:24297278c78d
parent: 71197:7eef821ab20d
parent: 71206:ab22ffd905b3
user: Georg Brandl <georg at python.org>
date: Mon Jul 04 19:58:12 2011 +0200
summary:
 Merge with 3.2.
files:
 .hgtags | 1 +
 Doc/Makefile | 2 +-
 Doc/library/curses.rst | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -89,3 +89,4 @@
 a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
+5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -113,7 +113,7 @@
 pydoc-topics: BUILDER = pydoc-topics
 pydoc-topics: build
 	@echo "Building finished; now copy build/pydoc-topics/topics.py" \
-	 "to Lib/pydoc_data/topics.py"
+	 "to ../Lib/pydoc_data/topics.py"
 
 htmlview: html
 	 $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -566,7 +566,7 @@
 
 Instantiate the string *str* with the supplied parameters, where *str* should
 be a parameterized string obtained from the terminfo database. E.g.
- ``tparm(tigetstr("cup"), 5, 3)`` could result in x``'033円[6;4H'``, the exact
+ ``tparm(tigetstr("cup"), 5, 3)`` could result in ``'033円[6;4H'``, the exact
 result depending on terminal type.
 
 
-- 
Repository URL: http://hg.python.org/cpython
