summaryrefslogtreecommitdiff
path: root/Doc/library/formatter.rst
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-20 19:06:03 +0000
committerGuido van Rossum <guido@python.org>2007-08-20 19:06:03 +0000
commit61e21b52f1873bc4b0da34431e54a9517c0030e1 (patch)
treee569dc3bbc88512e345691a151c2d64a8e7dc910 /Doc/library/formatter.rst
parent7d6068e6c9c3f8a2ee17b9b57e4f3f40b149c6eb (diff)
downloadcpython-git-61e21b52f1873bc4b0da34431e54a9517c0030e1.tar.gz
Merged revisions 57152-57220 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r57155 | brett.cannon | 2007-08-17 11:51:57 -0700 (Fri, 17 Aug 2007) | 2 lines Clarify the comment about setting the PYTHON variable for the Doc Makefile. ........ r57156 | brett.cannon | 2007-08-17 11:59:58 -0700 (Fri, 17 Aug 2007) | 3 lines Remove news entry for test.test_support.guard_warnings_filter as it has been removed. ........ r57158 | facundo.batista | 2007-08-17 12:16:44 -0700 (Fri, 17 Aug 2007) | 9 lines Added a flag (_send_traceback_header) to the SimpleXMLRPCServer class that allows sending back exception/stack trace information about internal server errors (this flag defaults to False to avoid sending such information unless explicitly enabled). Added tests to verify behavior of this new feature (these tests are skipped on win32 because of problems with WSAEWOULDBLOCK). Renamed HTTPTestCase to SimpleServerTestCase. [GSoC - Alan McIntyre] ........ r57160 | brett.cannon | 2007-08-17 13:16:15 -0700 (Fri, 17 Aug 2007) | 2 lines Make test_warnings re-entrant. ........ r57175 | georg.brandl | 2007-08-17 23:05:56 -0700 (Fri, 17 Aug 2007) | 2 lines Fix PDB command descriptions. ........ r57182 | brett.cannon | 2007-08-18 11:30:36 -0700 (Sat, 18 Aug 2007) | 3 lines Remove Mikael as the maintainer of BeOS at his request. With no maintainer should the port be deprecated in 2.6? ........ r57199 | georg.brandl | 2007-08-19 11:43:50 -0700 (Sun, 19 Aug 2007) | 2 lines Fix stray backticks. ........ r57211 | hyeshik.chang | 2007-08-19 23:49:18 -0700 (Sun, 19 Aug 2007) | 2 lines Add cheot-ga-keut composed make-up sequence support in EUC-KR codec. ........ r57216 | guido.van.rossum | 2007-08-20 08:18:04 -0700 (Mon, 20 Aug 2007) | 4 lines Add a hack (originally devised in a slightly different form by Thomas Wouters) to prevent spurious tracebacks when a daemon thread's cleanup happens to wake up when the world around it has already been destroyed. ........
Diffstat (limited to 'Doc/library/formatter.rst')
-rw-r--r--Doc/library/formatter.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/formatter.rst b/Doc/library/formatter.rst
index 2774a2bda6..ba09b8e838 100644
--- a/Doc/library/formatter.rst
+++ b/Doc/library/formatter.rst
@@ -242,8 +242,8 @@ typically be provided by the application.
.. method:: writer.new_font(font)
Set the font style. The value of *font* will be ``None``, indicating that the
- device's default font should be used, or a tuple of the form ``(``*size*,
- *italic*, *bold*, *teletype*``)``. Size will be a string indicating the size of
+ device's default font should be used, or a tuple of the form ``(size,
+ italic, bold, teletype)``. Size will be a string indicating the size of
font that should be used; specific strings and their interpretation must be
defined by the application. The *italic*, *bold*, and *teletype* values are
Boolean values specifying which of those font attributes should be used.