Merged revisions 67005 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Do, 23 Okt 2008) | 2 lines

  Use the correct names of the stateless codec functions (Fixes issue 4178).
........

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 9fff0a25af2b516fabb77e302b2f3f60c0c03c4c..bc8bc7d81204ddbfedea02f97bbb107794f61485 100644 (file)
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -32,9 +32,9 @@ It defines the following functions:
 
    * ``name`` The name of the encoding;
 
-   * ``encoder`` The stateless encoding function;
+   * ``encode`` The stateless encoding function;
 
-   * ``decoder`` The stateless decoding function;
+   * ``decode`` The stateless decoding function;
 
    * ``incrementalencoder`` An incremental encoder class or factory function;
 
@@ -46,7 +46,7 @@ It defines the following functions:
 
    The various functions or classes take the following arguments:
 
-   *encoder* and *decoder*: These must be functions or methods which have the same
+   *encode* and *decode*: These must be functions or methods which have the same
    interface as the :meth:`encode`/:meth:`decode` methods of Codec instances (see
    Codec Interface). The functions/methods are expected to work in a stateless
    mode.