summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2012-07-27 09:55:16 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2012-07-27 09:55:16 (GMT)
commita61b45980b4a6187e043abfb10c727b82e619ee2 (patch)
tree36dc0752a47f08db8714251f70418c27348a04e8 /Doc
parent9eeea48cc91b2f7c6d9ac5420a3c84c0abb34e25 (diff)
parenta58d668fd92bab2265979784ef8edb9c3ea3f093 (diff)
downloadcpython-a61b45980b4a6187e043abfb10c727b82e619ee2.zip
cpython-a61b45980b4a6187e043abfb10c727b82e619ee2.tar.gz
cpython-a61b45980b4a6187e043abfb10c727b82e619ee2.tar.bz2
Merged documentation update from 3.2.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/logging-cookbook.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index bb9c166..92af0ec 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1589,7 +1589,7 @@ appear before it.
As this behaviour is broken, the incorrect BOM insertion code is being removed
from Python 3.2.4 and later. However, it is not being replaced, and if you
-want to produce RFC 5424-compliant messages which includes a BOM, an optional
+want to produce RFC 5424-compliant messages which include a BOM, an optional
pure-ASCII sequence before it and arbitrary Unicode after it, encoded using
UTF-8, then you need to do the following:
@@ -1607,8 +1607,8 @@ UTF-8, then you need to do the following:
way, it will remain unchanged after UTF-8 encoding).
#. Replace the Unicode section with whatever placeholders you like; if the data
- which appears there after substitution is Unicode, that's fine -- it will be
- encoded using UTF-8.
+ which appears there after substitution contains characters outside the ASCII
+ range, that's fine -- it will be encoded using UTF-8.
The formatted message *will* be encoded using UTF-8 encoding by
``SysLogHandler``. If you follow the above rules, you should be able to produce