aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2012-03-23 07:51:16 +1100
committerRob Pike <r@golang.org>2012-03-23 07:51:16 +1100
commita99e9c5db51cdffdad6e561d456b54ffab03cd1f (patch)
tree6c2fff4d214711f9c6eea7c049eb03ffe7867f50
parentd12f1ff7ad6ce477819d2e3ba596390ca9aa568a (diff)
downloadgo-a99e9c5db51cdffdad6e561d456b54ffab03cd1f.tar.gz
go-a99e9c5db51cdffdad6e561d456b54ffab03cd1f.zip
doc/articles: rename concurrency patterns article
The old name, automatically generated, was ludicrously verbose. Also clean up an example to use time.Second. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/5876051
-rw-r--r--doc/articles/concurrency_patterns.html (renamed from doc/articles/go_concurrency_patterns_timing_out_moving_on.html)0
-rw-r--r--doc/docs.html2
-rw-r--r--doc/progs/timeout1.go2
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/articles/go_concurrency_patterns_timing_out_moving_on.html b/doc/articles/concurrency_patterns.html
index 63c8cd59e8..63c8cd59e8 100644
--- a/doc/articles/go_concurrency_patterns_timing_out_moving_on.html
+++ b/doc/articles/concurrency_patterns.html
diff --git a/doc/docs.html b/doc/docs.html
index a75ae56cf2..709c081528 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -105,7 +105,7 @@ Guided tours of Go programs.
<li><a href="http://blog.golang.org/2010/04/json-rpc-tale-of-interfaces.html">JSON-RPC: a tale of interfaces</a></li>
<li><a href="/doc/articles/gos_declaration_syntax.html">Go's Declaration Syntax</a></li>
<li><a href="/doc/articles/defer_panic_recover.html">Defer, Panic, and Recover</a></li>
-<li><a href="/doc/articles/go_concurrency_patterns_timing_out_moving_on.html">Go Concurrency Patterns: Timing out, moving on</a></li>
+<li><a href="/doc/articles/concurrency_patterns.html">Go Concurrency Patterns: Timing out, moving on</a></li>
<li><a href="/doc/articles/slices_usage_and_internals.html">Go Slices: usage and internals</a></li>
<li><a href="http://blog.golang.org/2011/05/gif-decoder-exercise-in-go-interfaces.html">A GIF decoder: an exercise in Go interfaces</a></li>
<li><a href="/doc/articles/error_handling.html">Error Handling and Go</a></li>
diff --git a/doc/progs/timeout1.go b/doc/progs/timeout1.go
index a6c95624c8..5221770ec6 100644
--- a/doc/progs/timeout1.go
+++ b/doc/progs/timeout1.go
@@ -11,7 +11,7 @@ func Timeout() {
ch := make(chan bool, 1)
timeout := make(chan bool, 1)
go func() {
- time.Sleep(1e9) // one second
+ time.Sleep(1 * time.Second)
timeout <- true
}()