Update prebuilts to go 1.5.1
Change-Id: I626e6697429cdd6918fd22586ca7a746f6525c55
diff --git a/doc/install.html b/doc/install.html
index 9561fdd..e9f0f0d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -3,10 +3,12 @@
"Path": "/doc/install"
}-->
+<div class="hideFromDownload">
+
<h2 id="download">Download the Go distribution</h2>
<p>
-<a href="https://golang.org/dl/" id="start" class="download" target="_blank">
+<a href="https://golang.org/dl/" id="start" class="download">
<span class="big">Download Go</span>
<span class="desc">Click here to visit the downloads page</span>
</a>
@@ -14,9 +16,10 @@
<p>
<a href="https://golang.org/dl/" target="_blank">Official binary
-distributions</a> are available for the FreeBSD (release 8 and above), Linux, Mac OS X (Snow Leopard
-and above), and Windows operating systems and the 32-bit (<code>386</code>) and
-64-bit (<code>amd64</code>) x86 processor architectures.
+distributions</a> are available for the FreeBSD (release 8-STABLE and above),
+Linux, Mac OS X (10.7 and above), and Windows operating systems and
+the 32-bit (<code>386</code>) and 64-bit (<code>amd64</code>) x86 processor
+architectures.
</p>
<p>
@@ -30,11 +33,11 @@
<h2 id="requirements">System requirements</h2>
<p>
-The <code>gc</code> compiler supports the following operating systems and
-architectures. Please ensure your system meets these requirements before
-proceeding. If your OS or architecture is not on the list, it's possible that
-<code>gccgo</code> might support your setup; see
-<a href="/doc/install/gccgo">Setting up and using gccgo</a> for details.
+Go binary distributions are available for these supported operating systems and architectures.
+Please ensure your system meets these requirements before proceeding.
+If your OS or architecture is not on the list, you may be able to
+<a href="/doc/install/source">install from source</a> or
+<a href="/doc/install/gccgo">use gccgo instead</a>.
</p>
<table class="codetable" frame="border" summary="requirements">
@@ -44,9 +47,9 @@
<th align="center">Notes</th>
</tr>
<tr><td colspan="3"><hr></td></tr>
-<tr><td>FreeBSD 8 or later</td> <td>amd64, 386, arm</td> <td>Debian GNU/kFreeBSD not supported; FreeBSD/ARM needs FreeBSD 10 or later</td></tr>
-<tr><td>Linux 2.6.23 or later with glibc</td> <td>amd64, 386, arm</td> <td>CentOS/RHEL 5.x not supported; no binary distribution for ARM yet</td></tr>
-<tr><td>Mac OS X 10.6 or later</td> <td>amd64, 386</td> <td>use the gcc<sup>†</sup> that comes with Xcode<sup>‡</sup></td></tr>
+<tr><td>FreeBSD 8-STABLE or later</td> <td>amd64</td> <td>Debian GNU/kFreeBSD not supported</td></tr>
+<tr><td>Linux 2.6.23 or later with glibc</td> <td>amd64, 386, arm</td> <td>CentOS/RHEL 5.x not supported; install from source for ARM</td></tr>
+<tr><td>Mac OS X 10.7 or later</td> <td>amd64</td> <td>use the clang or gcc<sup>†</sup> that comes with Xcode<sup>‡</sup></td></tr>
<tr><td>Windows XP or later</td> <td>amd64, 386</td> <td>use MinGW gcc<sup>†</sup>. No need for cygwin or msys.</td></tr>
</table>
@@ -59,6 +62,8 @@
Downloads preferences panel.
</p>
+</div><!-- hideFromDownload -->
+
<h2 id="install">Install the Go tools</h2>
@@ -67,6 +72,8 @@
first <a href="#uninstall">remove the existing version</a>.
</p>
+<div id="tarballInstructions">
+
<h3 id="tarball">Linux, Mac OS X, and FreeBSD tarballs</h3>
<p>
@@ -76,10 +83,10 @@
</p>
<pre>
-tar -C /usr/local -xzf go$VERSION.$OS-$ARCH.tar.gz
+tar -C /usr/local -xzf <span class="downloadFilename">go$VERSION.$OS-$ARCH.tar.gz</span>
</pre>
-<p>
+<p class="hideFromDownload">
Choose the archive file appropriate for your installation.
For instance, if you are installing Go version 1.2.1 for 64-bit x86 on Linux,
the archive you want is called <code>go1.2.1.linux-amd64.tar.gz</code>.
@@ -124,6 +131,10 @@
location.
</p>
+</div><!-- tarballInstructions -->
+
+<div id="darwinPackageInstructions">
+
<h3 id="osx">Mac OS X package installer</h3>
<p>
@@ -138,15 +149,21 @@
Terminal sessions for the change to take effect.
</p>
+</div><!-- darwinPackageInstructions -->
+
+<div id="windowsInstructions">
+
<h3 id="windows">Windows</h3>
-<p>
+<p class="hideFromDownload">
The Go project provides two installation options for Windows users
(besides <a href="/doc/install/source">installing from source</a>):
a zip archive that requires you to set some environment variables and an
MSI installer that configures your installation automatically.
</p>
+<div id="windowsInstallerInstructions">
+
<h4 id="windows_msi">MSI installer</h4>
<p>
@@ -161,6 +178,10 @@
command prompts for the change to take effect.
</p>
+</div><!-- windowsInstallerInstructions -->
+
+<div id="windowsZipInstructions">
+
<h4 id="windows_zip">Zip archive</h4>
<p>
@@ -176,6 +197,8 @@
Add the <code>bin</code> subdirectory of your Go root (for example, <code>c:\Go\bin</code>) to your <code>PATH</code> environment variable.
</p>
+</div><!-- windowsZipInstructions -->
+
<h4 id="windows_env">Setting environment variables under Windows</h4>
<p>
@@ -185,15 +208,38 @@
Settings" option inside the "System" control panel.
</p>
+</div><!-- windowsInstructions -->
+
<h2 id="testing">Test your installation</h2>
<p>
-Check that Go is installed correctly by building a simple program, as follows.
+Check that Go is installed correctly by setting up a workspace
+and building a simple program, as follows.
</p>
<p>
-Create a file named <code>hello.go</code> and put the following program in it:
+Create a directory to contain your <a href="code.html#Workspaces">workspace</a>,
+<code>$HOME/work</code> for example, and set the <code>GOPATH</code> environment
+variable to point to that location.
+</p>
+
+<pre>
+$ <b>export GOPATH=$HOME/work</b>
+</pre>
+
+<p>
+You should put the above command in your shell startup script
+(<code>$HOME/.profile</code> for example) or, if you use Windows,
+follow the <a href="#windows_env">instructions above</a> to set the
+<code>GOPATH</code> environment variable on your system.
+</p>
+
+<p>
+Next, make the directories <code>src/github.com/user/hello</code> inside your
+workspace (if you use GitHub, substitute your user name for <code>user</code>),
+and inside the <code>hello</code> directory create a file named <code>hello.go</code>
+with the following contents:
</p>
<pre>
@@ -207,11 +253,21 @@
</pre>
<p>
-Then run it with the <code>go</code> tool:
+Then compile it with the <code>go</code> tool:
</p>
<pre>
-$ go run hello.go
+$ <b>go install github.com/user/hello</b>
+</pre>
+
+<p>
+The above command will put an executable command named <code>hello</code>
+(or <code>hello.exe</code>) inside the <code>bin</code> directory of your workspace.
+Execute the command to see the greeting:
+</p>
+
+<pre>
+$ <b>$GOPATH/bin/hello</b>
hello, world
</pre>
@@ -219,17 +275,10 @@
If you see the "hello, world" message then your Go installation is working.
</p>
-
-<h2 id="gopath">Set up your work environment</h2>
-
<p>
-You're almost done.
-You just need to set up your environment.
-</p>
-
-<p>
-Read the <a href="/doc/code.html">How to Write Go Code</a> document,
-which provides <b>essential setup instructions</b> for using the Go tools.
+Before rushing off to write Go code please read the
+<a href="/doc/code.html">How to Write Go Code</a> document,
+which describes some essential concepts about using the Go tools.
</p>