From de75569016969ee6cd0652fabf7d5faf6b542419 Mon Sep 17 00:00:00 2001
From: Eric Smith <eric@trueblade.com>
Date: Thu, 25 Feb 2010 14:59:39 +0000
Subject: Merged revisions 78446 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78446 | eric.smith | 2010-02-25 09:58:13 -0500 (Thu, 25 Feb 2010) | 9 lines

  Merged revisions 78444 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78444 | eric.smith | 2010-02-25 09:26:33 -0500 (Thu, 25 Feb 2010) | 1 line

    Issue #7928: Document str.format element_index better.
  ........
................
---
 Doc/library/string.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 9339270..c7aba99 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -199,7 +199,8 @@ The grammar for a replacement field is as follows:
       field_name: arg_name ("." `attribute_name` | "[" `element_index` "]")*
       arg_name: (`identifier` | `integer`)?
       attribute_name: `identifier`
-      element_index: `integer`
+      element_index: `integer` | `index_string`
+      index_string: <any source character except "]"> +
       conversion: "r" | "s" | "a"
       format_spec: <described in the next section>
 
-- 
cgit v0.12