diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2011-12-24 13:52:19 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2011-12-24 13:52:19 (GMT) |
| commit | d126af8a54b08388c5cbc96cf26d7bc611d9f567 (patch) | |
| tree | c1afbfada225391b9507345113ded06f7cb346ab | |
| parent | e7e1cccd6965a77584ae2a9e7d9fa3e41c2ba0c8 (diff) | |
| parent | 0b7e5369f15046d73c7d1426bb8e28475cf1d05f (diff) | |
| download | cpython-d126af8a54b08388c5cbc96cf26d7bc611d9f567.zip cpython-d126af8a54b08388c5cbc96cf26d7bc611d9f567.tar.gz cpython-d126af8a54b08388c5cbc96cf26d7bc611d9f567.tar.bz2 | |
merge with 3.2
| -rw-r--r-- | Doc/library/syslog.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst index a3b374a..795d66d 100644 --- a/Doc/library/syslog.rst +++ b/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...') |