diff --git a/Doc/library/code.rst b/Doc/library/code.rst
index 8f7692df9fb22d..6d3a3dce5f23d5 100644
--- a/Doc/library/code.rst
+++ b/Doc/library/code.rst
@@ -112,7 +112,7 @@ Interactive Interpreter Objects
    with it.
 
 
-.. method:: InteractiveInterpreter.showsyntaxerror(filename=None)
+.. method:: InteractiveInterpreter.showsyntaxerror(filename=None, **kwargs)
 
    Display the syntax error that just occurred.  This does not display a stack
    trace because there isn't one for syntax errors. If *filename* is given, it is
@@ -166,7 +166,7 @@ interpreter objects as well as the following additions.
       Print an exit message when exiting.
 
 
-.. method:: InteractiveConsole.push(line)
+.. method:: InteractiveConsole.push(line, filename=None, _symbol="single")
 
    Push a line of source text to the interpreter. The line should not have a
    trailing newline; it may have internal newlines.  The line is appended to a
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index a129a26190ba99..05e339a3669986 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -607,9 +607,9 @@ define in order to be compatible with the Python codec registry.
    object.
 
 
-   .. method:: encode(object, final=False)
+   .. method:: encode(input, final=False)
 
-      Encodes *object* (taking the current state of the encoder into account)
+      Encodes *input* (taking the current state of the encoder into account)
       and returns the resulting encoded object. If this is the last call to
       :meth:`encode` *final* must be true (the default is false).
 
@@ -664,9 +664,9 @@ define in order to be compatible with the Python codec registry.
    object.
 
 
-   .. method:: decode(object, final=False)
+   .. method:: decode(input, final=False)
 
-      Decodes *object* (taking the current state of the decoder into account)
+      Decodes *input* (taking the current state of the decoder into account)
       and returns the resulting decoded object. If this is the last call to
       :meth:`decode` *final* must be true (the default is false). If *final* is
       true the decoder must decode the input completely and must flush all
diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index 5a950081a1c98d..3aa5342cca2427 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -147,7 +147,7 @@ And::
    executor.submit(wait_on_future)
 
 
-.. class:: ThreadPoolExecutor(max_workers=None, thread_name_prefix='', initializer=None, initargs=())
+.. class:: ThreadPoolExecutor(max_workers=None, thread_name_prefix='', initializer=None, initargs=(), **ctxkwargs)
 
    An :class:`Executor` subclass that uses a pool of at most *max_workers*
    threads to execute calls asynchronously.
@@ -194,6 +194,10 @@ And::
       Default value of *max_workers* is changed to
       ``min(32, (os.process_cpu_count() or 1) + 4)``.
 
+   .. versionchanged:: next
+      Added *ctxkwargs* to pass additional arguments to ``cls.prepare_context``
+      class method.
+
 
 .. _threadpoolexecutor-example:
 
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
index ac0f3fca3d72fd..fc5ebabcd7f805 100644
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1229,14 +1229,14 @@ ConfigParser Objects
          interpolation.
 
 
-   .. method:: set(section, option, value)
+   .. method:: set(section, option, value=None)
 
       If the given section exists, set the given option to the specified value;
       otherwise raise :exc:`NoSectionError`.  *option* and *value* must be
       strings; if not, :exc:`TypeError` is raised.
 
 
-   .. method:: write(fileobject, space_around_delimiters=True)
+   .. method:: write(fp, space_around_delimiters=True)
 
       Write a representation of the configuration to the specified :term:`file
       object`, which must be opened in text mode (accepting strings).  This
@@ -1266,12 +1266,12 @@ ConfigParser Objects
       fact existed, return ``True``.  Otherwise return ``False``.
 
 
-   .. method:: optionxform(option)
+   .. method:: optionxform(optionstr)
 
-      Transforms the option name *option* as found in an input file or as passed
+      Transforms the option name *optionstr* as found in an input file or as passed
       in by client code to the form that should be used in the internal
       structures.  The default implementation returns a lower-case version of
-      *option*; subclasses may override this or client code can set an attribute
+      *optionstr*; subclasses may override this or client code can set an attribute
       of this name on instances to affect this behavior.
 
       You don't need to subclass the parser to use this method, you can also
@@ -1354,7 +1354,7 @@ RawConfigParser Objects
       Added support for :const:`UNNAMED_SECTION`.
 
 
-   .. method:: set(section, option, value)
+   .. method:: set(section, option, value=None)
 
       If the given section exists, set the given option to the specified value;
       otherwise raise :exc:`NoSectionError`.  While it is possible to use
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
index 8ca949368db4ff..b6f33dc8097e1e 100644
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -196,9 +196,9 @@ Data Types
          :start: The first integer value for the Enum (used by :class:`auto`).
          :boundary:  How to handle out-of-range values from bit operations (:class:`Flag` only).
 
-   .. method:: EnumType.__contains__(cls, member)
+   .. method:: EnumType.__contains__(cls, value)
 
-      Returns ``True`` if member belongs to the ``cls``::
+      Returns ``True`` if value belongs to the ``cls``::
 
         >>> some_var = Color.RED
         >>> some_var in Color
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 1197b575c00455..a08f8a381bf91c 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -34,14 +34,16 @@ handler.  Code to create and run the server looks like this::
        httpd.serve_forever()
 
 
-.. class:: HTTPServer(server_address, RequestHandlerClass)
+.. class:: HTTPServer(server_address, RequestHandlerClass, \
+                      bind_and_activate=True)
 
    This class builds on the :class:`~socketserver.TCPServer` class by storing
    the server address as instance variables named :attr:`server_name` and
    :attr:`server_port`. The server is accessible by the handler, typically
    through the handler's :attr:`server` instance variable.
 
-.. class:: ThreadingHTTPServer(server_address, RequestHandlerClass)
+.. class:: ThreadingHTTPServer(server_address, RequestHandlerClass, \
+                               bind_and_activate=True)
 
    This class is identical to HTTPServer but uses threads to handle
    requests by using the :class:`~socketserver.ThreadingMixIn`. This
@@ -281,14 +283,14 @@ provides three different variants:
       HTTP code associated with the response. If a size of the response is
       available, then it should be passed as the *size* parameter.
 
-   .. method:: log_error(...)
+   .. method:: log_error(format, *args)
 
       Logs an error when a request cannot be fulfilled. By default, it passes
       the message to :meth:`log_message`, so it takes the same arguments
       (*format* and additional values).
 
 
-   .. method:: log_message(format, ...)
+   .. method:: log_message(format, *args)
 
       Logs an arbitrary message to ``sys.stderr``. This is typically overridden
       to create custom error logging mechanisms. The *format* argument is a
diff --git a/Lib/configparser.py b/Lib/configparser.py
index 9dc4fa515cfcbe..af7f1c11dc58e9 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -134,7 +134,7 @@
     remove_option(section, option)
         Remove the given option from the given section.
 
-    set(section, option, value)
+    set(section, option, value=None)
         Set the given option.
 
     write(fp, space_around_delimiters=True)