summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-17 08:33:18 +0000
committerGeorg Brandl <georg@python.org>2010-01-17 08:33:18 +0000
commita54f52376b1cf272ceb8e98eb78bf4d8b6273475 (patch)
tree9760e82f49510fe0d7a67881f8fc133b7517c649
parent9c6f2ea988e94c57028c48167b53d29f4a079699 (diff)
downloadcpython-git-a54f52376b1cf272ceb8e98eb78bf4d8b6273475.tar.gz
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(). ........
-rw-r--r--Doc/library/calendar.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index f2e218390d..d650ff45f1 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -129,7 +129,7 @@ it's the base calendar for all computations.
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 @@ it's the base calendar for all computations.
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.