#17714: merge with 3.3.

3ed3b3b4 · Ezio Melotti · 7168879e · c58a3ea7 · 3ed3b3b4
Commit 3ed3b3b4 authored May 07, 2013 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Doc/library/codecs.rst Doc/library/codecs.rst +3 -1

No files found.
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1194,7 +1194,9 @@ The following codecs provide bytes-to-bytes mappings.
 | Codec              | Aliases                   | Purpose                   |
 +====================+===========================+===========================+
 | base64_codec       | base64, base-64           | Convert operand to MIME   |
-|                    |                           | base64                    |
+|                    |                           | base64 (the result always |
+|                    |                           | includes a trailing       |
+|                    |                           | ``'\n'``)                 |
 +--------------------+---------------------------+---------------------------+
 | bz2_codec          | bz2                       | Compress the operand      |
 |                    |                           | using bz2                 |