[Python-checkins] cpython (merge 3.2 -> default): Merged documentation update from 3.2.

[vinay.sajip]

http://hg.python.org/cpython/rev/90b36463082e
changeset:   78294:90b36463082e
parent:      78291:ddf15cd9be4a
parent:      78293:e18f5301f406
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Jul 27 10:55:16 2012 +0100
summary:
  Merged documentation update from 3.2.

files:
  Doc/howto/logging-cookbook.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1589,7 +1589,7 @@
 
 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 @@
    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

-- 
Repository URL: http://hg.python.org/cpython