[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2
sandro.tosi
python-checkins at python.org
Sat Dec 24 15:01:27 CET 2011
http://hg.python.org/cpython/rev/ea4ff5528e40
changeset: 74154:ea4ff5528e40
parent: 74151:1461327e63b5
parent: 74153:ba2f6978502e
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Sat Dec 24 14:52:19 2011 +0100
summary:
merge with 3.2
files:
Doc/library/syslog.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -30,7 +30,7 @@
``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 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 @@
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...')
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list