From: Ezio Melotti Date: Thu, 21 Apr 2011 22:57:47 +0000 (+0300) Subject: Merge with 3.2. X-Git-Tag: v3.3.0a1~2524 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=707d1e6cea6834e826e5dbbbcd8593f1c81826b2;p=thirdparty%2FPython%2Fcpython.git Merge with 3.2. --- 707d1e6cea6834e826e5dbbbcd8593f1c81826b2 diff --cc Doc/library/argparse.rst index 25f8fa189859,61e1786b017a..a2bceae15c37 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@@ -361,10 -362,16 +362,16 @@@ formatter_clas ^^^^^^^^^^^^^^^ :class:`ArgumentParser` objects allow the help formatting to be customized by - specifying an alternate formatting class. -specifying an alternate formatting class. Currently, there are three such ++specifying an alternate formatting class. Currently, there are four such + classes: + + .. class:: RawDescriptionHelpFormatter + RawTextHelpFormatter + ArgumentDefaultsHelpFormatter ++ MetavarTypeHelpFormatter -The first two allow more control over how textual descriptions are displayed, -while the last automatically adds information about argument default values. - +:class:`RawDescriptionHelpFormatter` and :class:`RawTextHelpFormatter` give +more control over how textual descriptions are displayed. By default, :class:`ArgumentParser` objects line-wrap the description_ and epilog_ texts in command-line help messages::