merge

diff --cc Doc/reference/datamodel.rst
Simple merge

diff --cc Doc/reference/expressions.rst
Simple merge

diff --cc Doc/reference/simple_stmts.rst
index a42d1f6c6c33cf7898197ef2c7aae1bb567524c3,1748d5ad7d0adf2f395b57ae7f987b718781270a..61ae0993ef66931a4c12a138e5a984629ddd2983
--- 1/Doc/reference/simple_stmts.rst
--- 2/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