Backport checkin:

SF patch #1364946: Add a reference link from the dcoumentation of the encode
and decode methods to the documentation of the default error handlers.

diff --git a/Doc/lib/libcodecs.tex b/Doc/lib/libcodecs.tex
index b4c1bc40ff56319e2a979a3fd54b8b1fe8ec90cd..b65e1f4767a6904a16a84f38f3723b78ade95a5b 100644 (file)
--- a/Doc/lib/libcodecs.tex
+++ b/Doc/lib/libcodecs.tex
@@ -212,7 +212,7 @@ The others represent the BOM in UTF-8 and UTF-32 encodings.
 \end{datadesc}
 
 
-\subsection{Codec Base Classes}
+\subsection{Codec Base Classes \label{codec-base-classes}}
 
 The \module{codecs} module defines a set of base classes which define the
 interface and can also be used to easily write you own codecs for use

diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 93ed0e78e777130150247de4f05abef4137d185a..06907830b7a97f9486fa928579c0a09923ed5921 100644 (file)
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -590,7 +590,7 @@ may be given to set a different error handling scheme.  The default is
 \code{'strict'}, meaning that encoding errors raise
 \exception{UnicodeError}.  Other possible values are \code{'ignore'},
 \code{'replace'} and any other name registered via
-\function{codecs.register_error}.
+\function{codecs.register_error}, see section~\ref{codec-base-classes}.
 \versionadded{2.2}
 \versionchanged[Support for other error handling schemes added]{2.3}
 \end{methoddesc}
@@ -602,7 +602,8 @@ error handling scheme.  The default for \var{errors} is
 \code{'strict'}, meaning that encoding errors raise a
 \exception{UnicodeError}.  Other possible values are \code{'ignore'},
 \code{'replace'}, \code{'xmlcharrefreplace'}, \code{'backslashreplace'}
-and any other name registered via \function{codecs.register_error}.
+and any other name registered via \function{codecs.register_error},
+see section~\ref{codec-base-classes}.
 For a list of possible encodings, see section~\ref{standard-encodings}.
 \versionadded{2.0}
 \versionchanged[Support for \code{'xmlcharrefreplace'} and