From: Rob Pike <r@golang.org>
Date: Sat, 4 Jan 2014 18:52:59 +0000 (-0800)
Subject: spec: s/and/or/ for correctness and parallelism
X-Git-Tag: go1.3beta1~1061
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=82e2db70f6a08f55dc7c9d216af9642336390eff;p=gostls13.git

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://golang.org/cl/47110044
---

diff --git a/doc/go_spec.html b/doc/go_spec.html
index 3d3eaa4cfe..06f0fec83a 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>