diff -r e0540079940c Doc/library/curses.rst
--- a/Doc/library/curses.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/curses.rst	Mon May 14 11:41:02 2012 +0200
@@ -1120,7 +1120,7 @@
    rendition (as set by :meth:`bkgdset`) merged into them.
 
 
-.. method:: window.scroll([lines=1])
+.. method:: window.scroll(lines=1)
 
    Scroll the screen or scrolling region upward by *lines* lines.
 
diff -r e0540079940c Doc/library/http.cookiejar.rst
--- a/Doc/library/http.cookiejar.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/http.cookiejar.rst	Mon May 14 11:41:02 2012 +0200
@@ -707,7 +707,7 @@
 The :class:`Cookie` class also defines the following method:
 
 
-.. method:: Cookie.is_expired([now=None])
+.. method:: Cookie.is_expired(now=None)
 
    True if cookie has passed the time at which the server requested it should
    expire.  If *now* is given (in seconds since the epoch), return whether the
diff -r e0540079940c Doc/library/nis.rst
--- a/Doc/library/nis.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/nis.rst	Mon May 14 11:41:02 2012 +0200
@@ -17,7 +17,7 @@
 The :mod:`nis` module defines the following functions:
 
 
-.. function:: match(key, mapname[, domain=default_domain])
+.. function:: match(key, mapname, domain=default_domain)
 
    Return the match for *key* in map *mapname*, or raise an error
    (:exc:`nis.error`) if there is none. Both should be strings, *key* is 8-bit
@@ -30,7 +30,7 @@
    unspecified, lookup is in the default NIS domain.
 
 
-.. function:: cat(mapname[, domain=default_domain])
+.. function:: cat(mapname, domain=default_domain)
 
    Return a dictionary mapping *key* to *value* such that ``match(key,
    mapname)==value``. Note that both keys and values of the dictionary are
@@ -42,7 +42,7 @@
    unspecified, lookup is in the default NIS domain.
 
 
-.. function:: maps([domain=default_domain])
+.. function:: maps(domain=default_domain)
 
    Return a list of all valid maps.
 
diff -r e0540079940c Doc/library/packaging.fancy_getopt.rst
--- a/Doc/library/packaging.fancy_getopt.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/packaging.fancy_getopt.rst	Mon May 14 11:41:02 2012 +0200
@@ -33,7 +33,7 @@
    ``sys.argv[1:]`` if you pass ``None`` as *args*.
 
 
-.. class:: FancyGetopt([option_table=None])
+.. class:: FancyGetopt(option_table=None)
 
    The option_table is a list of 3-tuples: ``(long_option, short_option,
    help_string)``
@@ -46,7 +46,7 @@
 The :class:`FancyGetopt` class provides the following methods:
 
 
-.. method:: FancyGetopt.getopt([args=None, object=None])
+.. method:: FancyGetopt.getopt(args=None, object=None)
 
    Parse command-line options in args. Store as attributes on *object*.
 
@@ -67,7 +67,7 @@
    yet.
 
 
-.. method:: FancyGetopt.generate_help([header=None])
+.. method:: FancyGetopt.generate_help(header=None)
 
    Generate help text (a list of strings, one per suggested line of output) from
    the option table for this :class:`FancyGetopt` object.
diff -r e0540079940c Doc/library/select.rst
--- a/Doc/library/select.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/select.rst	Mon May 14 11:41:02 2012 +0200
@@ -267,7 +267,7 @@
    Remove a registered file descriptor from the epoll object.
 
 
-.. method:: epoll.poll([timeout=-1[, maxevents=-1]])
+.. method:: epoll.poll(timeout=-1, maxevents=-1)
 
    Wait for events. timeout in seconds (float)
 
@@ -371,7 +371,7 @@
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
+.. method:: kqueue.control(changelist, max_events, timeout=None) -> eventlist
 
    Low level interface to kevent
 
diff -r e0540079940c Doc/library/shutil.rst
--- a/Doc/library/shutil.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/shutil.rst	Mon May 14 11:41:02 2012 +0200
@@ -47,7 +47,7 @@
    be copied.
 
 
-.. function:: copyfile(src, dst[, symlinks=False])
+.. function:: copyfile(src, dst, symlinks=False)
 
    Copy the contents (no metadata) of the file named *src* to a file named
    *dst*.  *dst* must be the complete target file name; look at
@@ -67,7 +67,7 @@
       Added *symlinks* argument.
 
 
-.. function:: copymode(src, dst[, symlinks=False])
+.. function:: copymode(src, dst, symlinks=False)
 
    Copy the permission bits from *src* to *dst*.  The file contents, owner, and
    group are unaffected.  *src* and *dst* are path names given as strings.  If
@@ -78,7 +78,7 @@
    .. versionchanged:: 3.3
       Added *symlinks* argument.
 
-.. function:: copystat(src, dst[, symlinks=False])
+.. function:: copystat(src, dst, symlinks=False)
 
    Copy the permission bits, last access time, last modification time, and flags
    from *src* to *dst*.  The file contents, owner, and group are unaffected.  *src*
@@ -89,7 +89,7 @@
    .. versionchanged:: 3.3
       Added *symlinks* argument.
 
-.. function:: copy(src, dst[, symlinks=False]))
+.. function:: copy(src, dst, symlinks=False))
 
    Copy the file *src* to the file or directory *dst*.  If *dst* is a directory, a
    file with the same basename as *src*  is created (or overwritten) in the
@@ -100,7 +100,7 @@
    .. versionchanged:: 3.3
       Added *symlinks* argument.
 
-.. function:: copy2(src, dst[, symlinks=False])
+.. function:: copy2(src, dst, symlinks=False)
 
    Similar to :func:`shutil.copy`, but metadata is copied as well. This is
    similar to the Unix command :program:`cp -p`.  If *symlinks* is true,
diff -r e0540079940c Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst	Sun May 13 22:45:57 2012 -0500
+++ b/Doc/library/sqlite3.rst	Mon May 14 11:41:02 2012 +0200
@@ -526,7 +526,7 @@
    or :const:`None` when no more data is available.
 
 
-.. method:: Cursor.fetchmany([size=cursor.arraysize])
+.. method:: Cursor.fetchmany(size=cursor.arraysize)
 
    Fetches the next set of rows of a query result, returning a list.  An empty
    list is returned when no more rows are available.