[Python-checkins] r79490 - in python/branches/release31-maint: Doc/library/optparse.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Mon Mar 29 21:25:37 2010
New Revision: 79490

Log:
Merged revisions 79333 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79333 | senthil.kumaran | 2010-03-23 16:30:53 +0530 (Tue, 23 Mar 2010) | 9 lines
  
  Merged revisions 79329 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r79329 | senthil.kumaran | 2010-03-23 14:16:31 +0530 (Tue, 23 Mar 2010) | 2 lines
    
    Fixed Issue8209 - OptionParser keyword arg 'epilog' not mentioned in the docs
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/optparse.rst

Modified: python/branches/release31-maint/Doc/library/optparse.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/optparse.rst	(original)
+++ python/branches/release31-maint/Doc/library/optparse.rst	Mon Mar 29 21:25:37 2010
@@ -762,7 +762,8 @@
       The string to use when expanding ``"%prog"`` in ``usage`` and ``version``
       instead of ``os.path.basename(sys.argv[0])``.
 
-
+   ``epilog`` (default: ``None``)
+      A paragraph of help text to print after the option help.
 
 .. _optparse-populating-parser: