From 519725bb3c075ee2462c929f5997cb068e18466a Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 26 Mar 2012 16:50:58 +0200
Subject: Imported Upstream version 2012.03.22

---
 doc/install.html | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 7 deletions(-)

(limited to 'doc/install.html')

diff --git a/doc/install.html b/doc/install.html
index 4f2bb1c99..c8b1cf4cf 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -35,7 +35,7 @@ your operating system and processor architecture.
 
 <p>
 Official binary distributions are available
-for the FreeBSD, Linux, Mac OS X, and Windows operating systems
+for the FreeBSD, Linux, Mac OS X (Snow Leopard/Lion), and Windows operating systems
 and the 32-bit (<code>386</code>) and 64-bit (<code>amd64</code>)
 x86 processor architectures.
 </p>
@@ -51,7 +51,8 @@ OS/arch combination you may want to try
 
 <p>
 The Go binary distributions assume they will be installed in
-<code>/usr/local/go</code>, but it is possible to install them in a different
+<code>/usr/local/go</code> (or <code>c:\Go</code> under Windows),
+but it is possible to install them in a different
 location. If you do this, you will need to set the <code>GOROOT</code>
 environment variable to that directory when using the Go tools.
 </p>
@@ -66,6 +67,11 @@ export GOROOT=$HOME/go
 export PATH=$PATH:$GOROOT/bin
 </pre>
 
+<p>
+Windows users should read the section about <a href="#windows_env">setting
+environment variables under Windows</a>.
+</p>
+
 <h3 id="freebsd_linux">FreeBSD and Linux</h3>
 
 <p>
@@ -114,7 +120,48 @@ Terminal sessions for the change to take effect.
 <h3 id="windows">Windows</h3>
 
 <p>
-<font color="red">TODO: windows installation instructions.</font>
+The Go project provides two installation options for Windows users
+(besides <a href="/doc/install/source">installing from source</a>):
+an MSI installer that configures your installation automatically,
+and a zip archive that requires you to set some environment variables.
+</p>
+
+<h4 id="windows_msi">MSI installer</h3>
+
+<p>
+Open the <code>.msi</code> file and follow the prompts to install the Go tools.
+By default, the installer puts the Go distribution in <code>c:\Go</code>.
+</p>
+
+<p>
+The installer should put the <code>c:\Go\bin</code> directory in your
+<code>PATH</code> environment variable. You may need to restart any open
+command prompts for the change to take effect.
+</p>
+
+<h4 id="windows_zip">Zip archive</h3>
+
+<p>
+Extract the <code>.zip</code> file to the directory of your choice (we
+suggest <code>c:\Go</code>).
+</p>
+
+<p>
+If you chose a directory other than <code>c:\Go</code>, you must set
+the <code>GOROOT</code> environment variable to your chosen path.
+</p>
+
+<p>
+Add the <code>bin</code> subdirectory of your Go root (for example, <code>c:\Go\bin</code>) to to your <code>PATH</code> environment variable.
+</p>
+
+<h4 id="windows_env">Setting environment variables under Windows</h4>
+
+<p>
+Under Windows, you may set environment variables through the "Environment
+Variables" button on the "Advanced" tab of the "System" control panel. Some
+versions of Windows provide this control panel through the "Advanced System
+Settings" option inside the "System" control panel.
 </p>
 
 <h2 id="testing">Testing your installation</h2>
@@ -153,8 +200,7 @@ If you see the "hello, world" message then your Go installation is working.
 <h2 id="next">What's next</h2>
 
 <p>
-Start by taking <a href="http://code.google.com/p/go-tour/">A Tour of Go</a>
-or reading the <a href="/doc/go_tutorial.html">Go Tutorial</a>.
+Start by taking <a href="http://code.google.com/p/go-tour/">A Tour of Go</a>.
 </p>
 
 <p>
@@ -173,8 +219,13 @@ idiomatic Go code.
 </p>
 
 <p>
-For the full story, consult Go's extensive 
-<a href="/doc/">documentation</a>.
+For the full story, consult Go's extensive <a href="/doc/">documentation</a>.
+</p>
+
+<p>
+Subscribe to the
+<a href="http://groups.google.com/group/golang-announce">golang-announce</a>
+mailing list to be notified when a new stable version of Go is released.
 </p>
 
 
-- 
cgit v1.2.3