summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-08 01:49:35 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-08 01:49:35 (GMT)
commit46988d365946f2b61812b6ff60cb557e036fa6b1 (patch)
tree098caa6c1c32d409086693146136028d29d4805a /Doc/tutorial
parenta0fcaca4e1c29078f578fb96971398c70cf38900 (diff)
parentd5db14794bdeb4646ede5881aed43dd1838ffe7a (diff)
downloadcpython-46988d365946f2b61812b6ff60cb557e036fa6b1.zip
cpython-46988d365946f2b61812b6ff60cb557e036fa6b1.tar.gz
cpython-46988d365946f2b61812b6ff60cb557e036fa6b1.tar.bz2
Merge string formatting doc fixes from 3.5
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/introduction.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index c5c1343..8758f38 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -352,9 +352,8 @@ The built-in function :func:`len` returns the length of a string::
Strings support a large number of methods for
basic transformations and searching.
- :ref:`string-formatting`
- Information about string formatting with :meth:`str.format` is described
- here.
+ :ref:`formatstrings`
+ Information about string formatting with :meth:`str.format`.
:ref:`old-string-formatting`
The old formatting operations invoked when strings and Unicode strings are