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

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 0de7ff78904046d7f1eeae4c12aabd8f39aeb01a..ea4b5dad7df7e49eaf114b50f4d2234aaa8d59e4 100644 (file)
--- 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>