From: Raymond Hettinger <python@rcn.com>
Date: Tue, 27 May 2014 05:21:11 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.5.0a1~1582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a73a34d176ce7354d78a40582cb680a4cfc4239d;p=thirdparty%2FPython%2Fcpython.git

merge
---

a73a34d176ce7354d78a40582cb680a4cfc4239d
diff --cc Doc/reference/simple_stmts.rst
index a42d1f6c6c33,1748d5ad7d0a..61ae0993ef66
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@@ -280,10 -281,10 +281,10 @@@ operation and an assignment statement
  .. productionlist::
     augmented_assignment_stmt: `augtarget` `augop` (`expression_list` | `yield_expression`)
     augtarget: `identifier` | `attributeref` | `subscription` | `slicing`
 -   augop: "+=" | "-=" | "*=" | "/=" | "//=" | "%=" | "**="
 +   augop: "+=" | "-=" | "*=" | "@=" | "/=" | "//=" | "%=" | "**="
          : | ">>=" | "<<=" | "&=" | "^=" | "|="
  
- (See section :ref:`primaries` for the syntax definitions for the last three
+ (See section :ref:`primaries` for the syntax definitions of the last three
  symbols.)
  
  An augmented assignment evaluates the target (which, unlike normal assignment