Merge with 3.2.

1945f938 · Georg Brandl · 0a01f13a · bfd1edd1 · 1945f938 · 1945f938
Commit 1945f938 authored Jul 04, 2011 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.hgtags .hgtags +1 -0

Doc/Makefile Doc/Makefile +1 -1

Doc/library/curses.rst Doc/library/curses.rst +1 -1

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -89,3 +89,4 @@ acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
 a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2
 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1
 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1
+5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -113,7 +113,7 @@ doctest: build
 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')"

--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -566,7 +566,7 @@ The module :mod:`curses` defines the following functions:

   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.