aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2014-05-19 08:54:19 -0700
committerRobert Griesemer <gri@golang.org>2014-05-19 08:54:19 -0700
commit7f1d62dcefc868361e15db12608a8c8261be0e10 (patch)
treea66c191cc19d3365afb0d360477b968925789066
parent5b76f0ce3c705ffec0c22d38281a717de6f21af9 (diff)
downloadgo-7f1d62dcefc868361e15db12608a8c8261be0e10.tar.gz
go-7f1d62dcefc868361e15db12608a8c8261be0e10.zip
spec: clarify when a program exits
Fixes #8023. LGTM=rsc R=r, iant, ken, rsc CC=golang-codereviews https://golang.org/cl/98340043
-rw-r--r--doc/go_spec.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/go_spec.html b/doc/go_spec.html
index c8d6f362e5..536d370640 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -1,6 +1,6 @@
<!--{
"Title": "The Go Programming Language Specification",
- "Subtitle": "Version of May 14, 2014",
+ "Subtitle": "Version of May 19, 2014",
"Path": "/ref/spec"
}-->
@@ -5979,7 +5979,7 @@ func main() { … }
<p>
Program execution begins by initializing the main package and then
invoking the function <code>main</code>.
-When the function <code>main</code> returns, the program exits.
+When that function invocation returns, the program exits.
It does not wait for other (non-<code>main</code>) goroutines to complete.
</p>