merge with 3.2

Doc/library/syslog.rst

@@ -30,7 +30,7 @@ The module defines the following functions:
    ``openlog()`` will be called with no arguments.
 
 
-.. function:: openlog([ident[, logopt[, facility]]])
+.. function:: openlog([ident[, logoption[, facility]]])
 
    Logging options of subsequent :func:`syslog` calls can be set by calling
    :func:`openlog`.  :func:`syslog` will call :func:`openlog` with no arguments
@@ -38,7 +38,7 @@ The module defines the following functions:
 
    The optional *ident* keyword argument is a string which is prepended to every
    message, and defaults to ``sys.argv[0]`` with leading path components
-   stripped.  The optional *logopt* keyword argument (default is 0) is a bit
+   stripped.  The optional *logoption* keyword argument (default is 0) is a bit
    field -- see below for possible values to combine.  The optional *facility*
    keyword argument (default is :const:`LOG_USER`) sets the default facility for
    messages which do not have a facility explicitly encoded.
@@ -103,5 +103,5 @@ An example of setting some log options, these would include the process ID in
 logged messages, and write the messages to the destination facility used for
 mail logging::
 
-   syslog.openlog(logopt=syslog.LOG_PID, facility=syslog.LOG_MAIL)
+   syslog.openlog(logoption=syslog.LOG_PID, facility=syslog.LOG_MAIL)
    syslog.syslog('E-mail processing initiated...')