From 609de8597309c75cc69e7a2a86cb044994000ed7 Mon Sep 17 00:00:00 2001
From: Andrew Gerrand <adg@golang.org>
Date: Wed, 5 Oct 2011 13:33:48 -0700
Subject: [release-branch.r60] doc: link to A Tour of Go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

««« CL 5181045 / bc48691295c8
doc: link to A Tour of Go

R=golang-dev, rsc, r
CC=golang-dev
https://golang.org/cl/5181045
»»»

R=dsymonds
CC=golang-dev
https://golang.org/cl/5203041
---
 doc/docs.html    | 10 ++++++++++
 doc/install.html |  3 ++-
 doc/root.html    |  7 +++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/doc/docs.html b/doc/docs.html
index 7bc5c77d8e..a86d1714e5 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -16,6 +16,16 @@ Once you've learned a little about the language,
 idioms of programming in Go.
 </p>
 
+<h3 id="go_tour"><a href="http://go-tour.appspot.com/">A Tour of Go</a></h3>
+<p>
+An interactive introduction to Go in three sections.
+The first section covers basic syntax and data structures; the second discusses
+methods and interfaces; and the third introduces Go's concurrency primitives.
+Each section concludes with a few exercises so you can practice what you've
+learned. You can <a href="http://go-tour.appspot.com/">take the tour online</a> or
+<a href="http://code.google.com/p/go-tour/">install it locally</a>.
+</p>
+
 <h3 id="orig_tutorial"><a href="go_tutorial.html">A Tutorial for the Go Programming Language</a></h3>
 <p>
 The first tutorial. An introductory text that touches upon several core
diff --git a/doc/install.html b/doc/install.html
index a1bc899824..c47f9218bd 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -257,7 +257,8 @@ the process of building and testing Go programs.
 <h2 id="next">What's next</h2>
 
 <p>
-Start by reading the <a href="go_tutorial.html">Go Tutorial</a>.
+Start by taking <a href="http://code.google.com/p/go-tour/">A Tour of Go</a>
+or reading the <a href="go_tutorial.html">Go Tutorial</a>.
 </p>
 
 <p>
diff --git a/doc/root.html b/doc/root.html
index 8d76928c81..2d9a8979ba 100644
--- a/doc/root.html
+++ b/doc/root.html
@@ -49,10 +49,13 @@ google.setOnLoadCallback(loadFeed);
         It's a fast, statically typed, compiled language that feels like a 
         dynamically typed, interpreted language.
       </p>
-      <h2>Check it out!</h2>
+      <h2>
+        Get started now with
+	<a target="_blank" href="http://go-tour.appspot.com/">A Tour of Go</a>.
+      </h2>
       <p>
       <div class="how">[<a href="/doc/playground.html">How does this work?</a>]</div>
-      <a href="/doc/install.html">Install Go now</a>, or try it right here in your browser:</p>
+      Or try it right here in your browser:</p>
       <div id="playground" class="small"></div>
       <script src="/doc/play/playground.js"></script>
     </div>
-- 
cgit v1.2.3-54-g00ecf