From: Antoine Pitrou Date: Wed, 21 Jul 2010 15:55:40 +0000 (+0000) Subject: Merged revisions 83025 via svnmerge from X-Git-Tag: v3.1.3rc1~480 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86c590e64a734d8c13382fa92c34594d90d4fc5a;p=thirdparty%2FPython%2Fcpython.git Merged revisions 83025 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83025 | antoine.pitrou | 2010-07-21 17:54:48 +0200 (mer., 21 juil. 2010) | 3 lines Remove outdated mention of deprecated functions in the string module - they have been removed in 3.x. ........ --- diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 6e0fb4502663..46907aaa7969 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -7,13 +7,13 @@ .. index:: module: re -The :mod:`string` module contains a number of useful constants and classes, as -well as some deprecated legacy functions that are also available as methods on -strings. In addition, Python's built-in string classes support the sequence type -methods described in the :ref:`typesseq` section, and also the string-specific -methods described in the :ref:`string-methods` section. To output formatted -strings, see the :ref:`string-formatting` section. Also, see the :mod:`re` -module for string functions based on regular expressions. +The :mod:`string` module contains a number of useful constants and classes +for string formatting. In addition, Python's built-in string classes +support the sequence type methods described in the :ref:`typesseq` +section, and also the string-specific methods described in the +:ref:`string-methods` section. To output formatted strings, see the +:ref:`string-formatting` section. Also, see the :mod:`re` module for +string functions based on regular expressions. String constants