[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3: fix formatting of syntax description of function definition.

[chris.jerdonek]

http://hg.python.org/cpython/rev/59a189a15933
changeset:   79938:59a189a15933
parent:      79935:cbdd6852a274
parent:      79937:118a718ba32c
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Thu Oct 25 17:23:54 2012 -0700
summary:
  Merge from 3.3: fix formatting of syntax description of function definition.

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


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -442,8 +442,7 @@
    decorator: "@" `dotted_name` ["(" [`parameter_list` [","]] ")"] NEWLINE
    dotted_name: `identifier` ("." `identifier`)*
    parameter_list: (`defparameter` ",")*
-                 : (  "*" [`parameter`] ("," `defparameter`)*
-                 : [, "**" `parameter`]
+                 : ( "*" [`parameter`] ("," `defparameter`)* ["," "**" `parameter`]
                  : | "**" `parameter`
                  : | `defparameter` [","] )
    parameter: `identifier` [":" `expression`]

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