diff options
| author | Georg Brandl <georg@python.org> | 2011-07-04 17:58:12 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-07-04 17:58:12 (GMT) |
| commit | 1945f93888f6acadd0bde6541f39d7616f9a5392 (patch) | |
| tree | a937a10c51237ce087e356ec16b7ca561317d739 | |
| parent | 0a01f13af8b22c35a787ca056d64ada7913a08b8 (diff) | |
| parent | bfd1edd15541ff3d8ea89385faecdbcbba1a9773 (diff) | |
| download | cpython-1945f93888f6acadd0bde6541f39d7616f9a5392.zip cpython-1945f93888f6acadd0bde6541f39d7616f9a5392.tar.gz cpython-1945f93888f6acadd0bde6541f39d7616f9a5392.tar.bz2 | |
Merge with 3.2.
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/library/curses.rst | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -89,3 +89,4 @@ acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2 a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2 8ffac2337a3323323d02153ac919fd1483176652 v3.2.1b1 cfa9364997c7f2e67b9cbb45c3a5fa3bba4e4999 v3.2.1rc1 +5df549718fb4841ff521fe051f6b54f290fad5d8 v3.2.1rc2 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. |