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
........
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 @@
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: