From: Robert Griesemer <gri@golang.org>
Date: Wed, 31 Oct 2012 22:07:25 +0000 (-0700)
Subject: spec: slight wording change to remove a formal contradiction
X-Git-Tag: go1.1rc2~2012
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=369a974b41d0b75778a50f6d531263c99d98432a;p=gostls13.git

spec: slight wording change to remove a formal contradiction

Fixes #4324.

R=r
CC=golang-dev
https://golang.org/cl/6822062
---

diff --git a/doc/go_spec.html b/doc/go_spec.html
index bd3c75f515..0f3c5ed312 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -2128,18 +2128,18 @@ For struct literals the following rules apply:
 <ul>
 	<li>A key must be a field name declared in the LiteralType.
 	</li>
-	<li>A literal that does not contain any keys must
+	<li>An element list that does not contain any keys must
 	    list an element for each struct field in the
 	    order in which the fields are declared.
 	</li>
 	<li>If any element has a key, every element must have a key.
 	</li>
-	<li>A literal that contains keys does not need to
+	<li>An element list that contains keys does not need to
 	    have an element for each struct field. Omitted fields
 	    get the zero value for that field.
 	</li>
 	<li>A literal may omit the element list; such a literal evaluates
-		to the zero value for its type.
+	    to the zero value for its type.
 	</li>
 	<li>It is an error to specify an element for a non-exported
 	    field of a struct belonging to a different package.