Merge tag 'upstream/1.3' into debian-sid

Upstream version 1.3

1 files changed, 17 insertions, 16 deletions

diff --git a/doc/install.html b/doc/install.html
index af4c8f3d1..7282ae947 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -6,15 +6,15 @@
 <h2 id="download">Download the Go distribution</h2>
 
 <p>
-<a href="http://code.google.com/p/go/downloads" id="start" class="download" target="_blank">
+<a href="/dl/" id="start" class="download" target="_blank">
 <span class="big">Download Go</span>
 <span class="desc">Click here to visit the downloads page</span>
 </a>
 </p>
 
 <p>
-<a href="http://code.google.com/p/go/downloads" target="_blank">Official binary
-distributions</a> are available for the FreeBSD, Linux, Mac OS X (Snow Leopard
+<a href="https://code.google.com/p/go/wiki/Downloads?tm=2" 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.
 </p>
@@ -39,15 +39,15 @@ proceeding. If your OS or architecture is not on the list, it's possible that
 
 <table class="codetable" frame="border" summary="requirements">
 <tr>
-<th align="middle">Operating system</th>
-<th align="middle">Architectures</th>
-<th align="middle">Notes</th>
+<th align="center">Operating system</th>
+<th align="center">Architectures</th>
+<th align="center">Notes</th>
 </tr>
 <tr><td colspan="3"><hr></td></tr>
-<tr><td>FreeBSD 7 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>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>&#8224;</sup> that comes with Xcode<sup>&#8225;</sup></td></tr>
-<tr><td>Windows 2000 or later</td> <td>amd64, 386</td> <td>use mingw gcc<sup>&#8224;</sup>; cygwin or msys is not needed</td></tr>
+<tr><td>Windows XP or later</td> <td>amd64, 386</td> <td>use MinGW gcc<sup>&#8224;</sup>. No need for cgywin or msys.</td></tr>
 </table>
 
 <p>
@@ -70,18 +70,19 @@ first <a href="#uninstall">remove the existing version</a>.
 <h3 id="tarball">Linux, Mac OS X, and FreeBSD tarballs</h3>
 
 <p>
-<a href="http://code.google.com/p/go/downloads/list?q=OpSys-FreeBSD+OR+OpSys-Linux+OR+OpSys-OSX+Type-Archive">Download the archive</a>
+<a href="https://code.google.com/p/go/wiki/Downloads?tm=2">Download the archive</a>
 and extract it into <code>/usr/local</code>, creating a Go tree in
 <code>/usr/local/go</code>. For example:
 </p>
 
 <pre>
-tar -C /usr/local -xzf go1.2.1.linux-amd64.tar.gz
+tar -C /usr/local -xzf go$VERSION.$OS-$ARCH.tar.gz
 </pre>
 
 <p>
-The name of the archive may differ, depending on the version of Go you are
-installing and your system's operating system and processor architecture.
+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>.
 </p>
 
 <p>
@@ -126,7 +127,7 @@ location.
 <h3 id="osx">Mac OS X package installer</h3>
 
 <p>
-<a href="http://code.google.com/p/go/downloads/list?q=OpSys-OSX+Type-Installer">Download the package file</a>,
+<a href="https://code.google.com/p/go/wiki/Downloads?tm=2">Download the package file</a>,
 open it, and follow the prompts to install the Go tools.
 The package installs the Go distribution to <code>/usr/local/go</code>.
 </p>
@@ -149,7 +150,7 @@ MSI installer that configures your installation automatically.
 <h4 id="windows_msi">MSI installer</h4>
 
 <p>
-Open the <a href="http://code.google.com/p/go/downloads/list?q=OpSys-Windows+Type%3DInstaller">MSI file</a>
+Open the <a href="https://code.google.com/p/go/wiki/Downloads?tm=2">MSI file</a>
 and follow the prompts to install the Go tools.
 By default, the installer puts the Go distribution in <code>c:\Go</code>.
 </p>
@@ -163,7 +164,7 @@ command prompts for the change to take effect.
 <h4 id="windows_zip">Zip archive</h4>
 
 <p>
-<a href="http://code.google.com/p/go/downloads/list?q=OpSys-Windows+Type%3DArchive">Download the zip file</a> and extract it into the directory of your choice (we suggest <code>c:\Go</code>).
+<a href="https://code.google.com/p/go/wiki/Downloads?tm=2">Download the zip file</a> and extract it into the directory of your choice (we suggest <code>c:\Go</code>).
 </p>
 
 <p>
@@ -227,7 +228,7 @@ You just need to do a little more setup.
 </p>
 
 <p>
-<a href="/doc/code.html" class="download" id="start">
+<a href="/doc/code.html" class="download" id="writing">
 <span class="big">How to Write Go Code</span>
 <span class="desc">Learn how to set up and use the Go tools</span>
 </a>