Merge 3.2.1 release clone changes into main 3.2 branch after 3.2.1rc2 release.

This commit is contained in:
Georg Brandl 2011-07-04 19:55:22 +02:00
commit bfd1edd155
10 changed files with 60 additions and 45 deletions

View file

@ -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')"

View file

@ -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.