]> Cypherpunks repositories - gostls13.git/commitdiff
doc/go1.7.html: fix spelling of cancelation
authorIan Lance Taylor <iant@golang.org>
Thu, 2 Jun 2016 04:09:58 +0000 (21:09 -0700)
committerIan Lance Taylor <iant@golang.org>
Thu, 2 Jun 2016 04:13:08 +0000 (04:13 +0000)
We say "cancelation," not "cancellation."

Fixes #15928.

Change-Id: I66d545404665948a27281133cb9050eebf1debbb
Reviewed-on: https://go-review.googlesource.com/23673
Reviewed-by: Ian Lance Taylor <iant@golang.org>
doc/go1.7.html

index 9ee377ec8fdb6b612e48df6673d8bed5fd5d9aae..37e1e56d2460f60dbb173b2ccddfce4dee941c1f 100644 (file)
@@ -362,7 +362,7 @@ packages.
 <p>
 Go 1.7 moves the <code>golang.org/x/net/context</code> package
 into the standard library as <a href="/pkg/context/"><code>context</code></a>.
-This allows the use of contexts for cancellation, timeouts, and passing
+This allows the use of contexts for cancelation, timeouts, and passing
 request-scoped data in other standard library packages,
 including
 <a href="#net">net</a>,