[Python-checkins] cpython: Issue #19548: clean up merge issues in codecs docs

Wed Jan 7 04:15:03 CET 2015

https://hg.python.org/cpython/rev/20a5a56ce090
changeset: 94057:20a5a56ce090
parent: 94054:4d00d0109147
user: Nick Coghlan <ncoghlan at gmail.com>
date: Wed Jan 07 13:14:47 2015 +1000
summary:
 Issue #19548: clean up merge issues in codecs docs
Patch by Martin Panter to clean up some problems with the merge
of the codecs docs changes from Python 3.4.
files:
 Doc/library/codecs.rst | 8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -256,7 +256,6 @@
 encodings.
 
 
-.. _surrogateescape:
 .. _codec-base-classes:
 
 Codec Base Classes
@@ -273,6 +272,7 @@
 codec will handle encoding and decoding errors.
 
 
+.. _surrogateescape:
 .. _error-handlers:
 
 Error Handlers
@@ -319,7 +319,8 @@
 | | :func:`backslashreplace_errors`. |
 +-------------------------+-----------------------------------------------+
 | ``'namereplace'`` | Replace with ``\N{...}`` escape sequences |
-| | (only for encoding). |
+| | (only for encoding). Implemented in |
+| | :func:`namereplace_errors`. |
 +-------------------------+-----------------------------------------------+
 | ``'surrogateescape'`` | On decoding, replace byte with individual |
 | | surrogate code ranging from ``U+DC80`` to |
@@ -422,7 +423,8 @@
 
 .. function:: namereplace_errors(exception)
 
- Implements the ``namereplace`` error handling (for encoding only): the
+ Implements the ``'namereplace'`` error handling (for encoding with
+ :term:`text encodings <text encoding>` only): the
 unencodable character is replaced by a ``\N{...}`` escape sequence.
 
 .. versionadded:: 3.5
-- 
Repository URL: https://hg.python.org/cpython
