From: Andrew Gerrand <adg@golang.org>
Date: Fri, 21 Sep 2012 19:54:10 +0000 (+1000)
Subject: [release-branch.go1] doc: add two I/O talks to "Talks" section
X-Git-Tag: go1.0.3~145
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d9c11a7164ad06c507b2bd9f77ce119695a56c79;p=gostls13.git

[release-branch.go1] doc: add two I/O talks to "Talks" section

««« backport ddaabb722563
doc: add two I/O talks to "Talks" section

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6422056

»»»
---

diff --git a/doc/docs.html b/doc/docs.html
index 8826868f9d..12e76202b4 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -139,6 +139,16 @@ before Go 1 and contain some examples that are no longer correct, but they are
 still of value.
 </p>
 
+<h3 id="go_concurrency_patterns"><a href="http://www.youtube.com/watch?v=f6kdp27TYZs">Go Concurrency Patterns</a></h3>
+<p>
+Concurrency is the key to designing high performance network services. Go's concurrency primitives (goroutines and channels) provide a simple and efficient means of expressing concurrent execution. In this talk we see how tricky concurrency problems can be solved gracefully with simple Go code.
+</p>
+
+<h3 id="meet_the_go_team"><a href="http://www.youtube.com/watch?v=sln-gJaURzk">Meet the Go team</a></h3>
+<p>
+A panel discussion with David Symonds, Robert Griesemer, Rob Pike, Ken Thompson, Andrew Gerrand, and Brad Fitzpatrick.
+</p>
+
 <h3 id="writing_web_apps"><a href="http://www.youtube.com/watch?v=-i0hat7pdpk">Writing Web Apps in Go</a><font color="red">*</font></h3>
 <p>
 A talk by Rob Pike and Andrew Gerrand presented at Google I/O 2011.