summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2014-01-04 10:52:59 -0800
committerRob Pike <r@golang.org>2014-01-04 10:52:59 -0800
commit4f164aef1ceda83706ee104da75e11a2b0e81c4a (patch)
tree0d3a07f28a61f895349ffe1be6f4ba2ff048e3c7 /doc
parent430940386a4221dbed82647365968431c54eb5fc (diff)
downloadgo-4f164aef1ceda83706ee104da75e11a2b0e81c4a.tar.gz
spec: s/and/or/ for correctness and parallelism
No change to the meaning, just bad writing found by Doug McIlroy. Let's start the new year off with a bang. R=golang-codereviews, bradfitz, dave CC=golang-codereviews https://codereview.appspot.com/47110044
Diffstat (limited to 'doc')
-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 3d3eaa4cf..06f0fec83 100644
--- a/doc/go_spec.html
+++ b/doc/go_spec.html
@@ -1,6 +1,6 @@
<!--{
"Title": "The Go Programming Language Specification",
- "Subtitle": "Version of Nov 13, 2013",
+ "Subtitle": "Version of Jan 2, 2014",
"Path": "/ref/spec"
}-->
@@ -5263,7 +5263,7 @@ At any time the following relationship holds:
<p>
The length of a <code>nil</code> slice, map or channel is 0.
-The capacity of a <code>nil</code> slice and channel is 0.
+The capacity of a <code>nil</code> slice or channel is 0.
</p>
<p>