diff options
| author | Georg Brandl <georg@python.org> | 2011-07-04 17:55:22 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-07-04 17:55:22 (GMT) |
| commit | bfd1edd15541ff3d8ea89385faecdbcbba1a9773 (patch) | |
| tree | be7725f058280263a5378bc21ae9896e9ce9e56a /Doc | |
| parent | e40b3aabfb10e1f9fd31541369fec491029d5d46 (diff) | |
| parent | b1b25f0ffd6c2d31cf21fa7128ff64c314c3cd2e (diff) | |
| download | cpython-bfd1edd15541ff3d8ea89385faecdbcbba1a9773.zip cpython-bfd1edd15541ff3d8ea89385faecdbcbba1a9773.tar.gz cpython-bfd1edd15541ff3d8ea89385faecdbcbba1a9773.tar.bz2 | |
Merge 3.2.1 release clone changes into main 3.2 branch after 3.2.1rc2 release.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/library/curses.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index a1ffe63..cb56ea9 100644 --- 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')" diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst index fb57e76..b7039de 100644 --- 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. |