[Python-checkins] r77559 - in python/branches/release26-maint: Doc/library/calendar.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Jan 17 09:33:18 2010
New Revision: 77559

Log:
Merged revisions 76471 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76471 | georg.brandl | 2009-11-23 20:53:19 +0100 (Mo, 23 Nov 2009) | 1 line
  
  #7345: fix arguments of formatyear().
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/calendar.rst

Modified: python/branches/release26-maint/Doc/library/calendar.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/calendar.rst	(original)
+++ python/branches/release26-maint/Doc/library/calendar.rst	Sun Jan 17 09:33:18 2010
@@ -129,7 +129,7 @@
       Print a month's calendar as returned by :meth:`formatmonth`.
 
 
-   .. method:: formatyear(theyear, themonth[, w[, l[, c[, m]]]])
+   .. method:: formatyear(theyear[, w[, l[, c[, m]]]])
 
       Return a *m*-column calendar for an entire year as a multi-line string.
       Optional parameters *w*, *l*, and *c* are for date column width, lines per
@@ -160,7 +160,7 @@
       used.
 
 
-   .. method:: formatyear(theyear, themonth[, width])
+   .. method:: formatyear(theyear[, width])
 
       Return a year's calendar as an HTML table. *width* (defaulting to 3)
       specifies the number of months per row.