[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/21f1b8fb9cbc
changeset:   86155:21f1b8fb9cbc
parent:      86152:422e639f546f
parent:      86154:f7b4f0459dc6
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 08 21:28:42 2013 +0200
summary:
  merge with 3.3

files:
  Doc/reference/lexical_analysis.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -704,7 +704,7 @@
 The following tokens serve as delimiters in the grammar::
 
    (       )       [       ]       {       }
-   ,       :       .       ;       @       =
+   ,       :       .       ;       @       =       ->
    +=      -=      *=      /=      //=     %=
    &=      |=      ^=      >>=     <<=     **=
 

-- 
Repository URL: http://hg.python.org/cpython