From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sat, 14 Aug 2010 18:03:19 +0000 (+0000)
Subject: Remove bad merge (from svnmerge r82301)
X-Git-Tag: v3.2a2~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac521078d7e7a3bd90678d252e8ff91970ec9f5c;p=thirdparty%2FPython%2Fcpython.git

Remove bad merge (from svnmerge r82301)
---

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 76921cd4607e..1b2f5913192f 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1331,10 +1331,6 @@ functions based on regular expressions.
    You can use :meth:`str.maketrans` to create a translation map from
    character-to-character mappings in different formats.
 
-   You can use the :func:`~string.maketrans` helper function in the :mod:`string`
-   module to create a translation table. For string objects, set the *table*
-   argument to ``None`` for translations that only delete characters:
-
    .. note::
 
       An even more flexible approach is to create a custom character mapping