summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-08 19:28:42 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-08 19:28:42 (GMT)
commit100580f4c4ac8b386a38134f4894e9a11871dcc0 (patch)
tree64fe04c16cf1865cd51aafebd64f40cfb79d34c4 /Doc
parentf3c91210b9c99a2c0e37cc1fe74efeb79de94350 (diff)
parent97f962339f01cc1d17ac77893f20db3a457bb6b9 (diff)
downloadcpython-100580f4c4ac8b386a38134f4894e9a11871dcc0.zip
cpython-100580f4c4ac8b386a38134f4894e9a11871dcc0.tar.gz
cpython-100580f4c4ac8b386a38134f4894e9a11871dcc0.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/lexical_analysis.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 94f219b..0ed3d3b 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -704,7 +704,7 @@ Delimiters
The following tokens serve as delimiters in the grammar::
( ) [ ] { }
- , : . ; @ =
+ , : . ; @ = ->
+= -= *= /= //= %=
&= |= ^= >>= <<= **=