From: Andrew Gerrand <adg@golang.org>
Date: Tue, 28 Jan 2014 08:49:29 +0000 (+1100)
Subject: io: clarify MultiReader documentation
X-Git-Tag: go1.3beta1~857
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5be96aad0094b51757a40414fb7a5f3418de8067;p=gostls13.git

io: clarify MultiReader documentation

Fixes #7216.

LGTM=minux.ma
R=golang-codereviews, minux.ma
CC=golang-codereviews
https://golang.org/cl/54740044
---

diff --git a/src/pkg/io/multi.go b/src/pkg/io/multi.go
index 2c7e816cff..ab8dd5d3b4 100644
--- a/src/pkg/io/multi.go
+++ b/src/pkg/io/multi.go
@@ -26,7 +26,8 @@ func (mr *multiReader) Read(p []byte) (n int, err error) {
 
 // MultiReader returns a Reader that's the logical concatenation of
 // the provided input readers.  They're read sequentially.  Once all
-// inputs are drained, Read will return EOF.
+// inputs have returned EOF, Read will return EOF.  If any of the readers
+// return a non-nil, non-EOF error, Read will return that error.
 func MultiReader(readers ...Reader) Reader {
 	return &multiReader{readers}
 }