summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial/introduction.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-26 01:03:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-26 01:03:56 (GMT)
commite6f00637be87c8f5f0e50bf317d684ea421a6d19 (patch)
tree72af08d6c7d328792bce581755aa38c24969b6bd /Doc/tutorial/introduction.rst
parentdc6c16ac634eef50ba819adea2eed74651530197 (diff)
downloadcpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.zip
cpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.tar.gz
cpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.tar.bz2
Merged revisions 63655 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63655 | benjamin.peterson | 2008-05-25 19:54:22 -0500 (Sun, 25 May 2008) | 2 lines update the tutorial to use str.format ........
Diffstat (limited to 'Doc/tutorial/introduction.rst')
-rw-r--r--Doc/tutorial/introduction.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index fa412e9..66c5a7c 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -393,8 +393,12 @@ The built-in function :func:`len` returns the length of a string::
basic transformations and searching.
:ref:`string-formatting`
- The formatting operations invoked by the :meth:`format` string method are
- described in more detail here.
+ Information about string formatting with :meth:`str.format` is described
+ here.
+
+ :ref:`old-string-formatting`
+ The old formatting operations invoked when strings and Unicode strings are
+ the left operand of the ``%`` operator are described in more detail here.
.. _tut-unicodestrings: