DanielKeep · August 25, 2014 07:50
diff --git a/changes.patch b/changes.patch
 diff --git a/Doc-how-to-install-an-unofficial-nightly-for-Windows.md b/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
 index 6d53736..a54b87b 100644
 --- a/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
 +++ b/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
 @@ -1,81 +1 @@
 -WARNING: Every nightly snapshot mentioned in this document is **unofficial** and not maintained by the Rust core team.
 -**You are fully responsible for any problems due to the use of nightly snapshots.**
 -
 -## Using with MinGW
 -
 -Download and run the [MinGW installer](http://sourceforge.net/projects/mingw/files/latest/download?source=files) and follow the instructions.
 -There is a checkbox for whether to install the graphical user interface,
 -which we will not use but nevertheless may be useful.
 -
 -> TIP: You can install the GUI later using `mingw-get install mingw-get-gui`.
 -
 -MinGW, by default, does not append itself to the `PATH` environment variable.
 -Since running `rustc` anywhere requires this environment variable,
 -you should append a path to the MinGW executables to `PATH` in the control panel.
 -(In the default settings, the path would be `C:\MinGW\bin`.)
 -
 -Turn the Command Prompt on and type the following.
 -
 -    > mingw-get install mingw32-base
 -
 -> TIP: This would install the C compiler. If you don't want it, use `mingw-get install gcc` instead.
 -
 -Install [Chocolatey](http://chocolatey.org/)
 -by copying the command line in the website and pasting it into the Command Prompt.
 -
 -    > @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin
 -
 -> TIP: When you get an error (mostly due to older versions of PowerShell), use an [alternative method](https://github.com/chocolatey/chocolatey/wiki/Installation#wiki-powershell-through-batch-method) to install.
 -
 -Then install Rust using Chocolatey.
 -We will use the [NuGet Rust package](https://www.nuget.org/packages/Rust/) maintained by Heather.
 -Since NuGet is not a default package feed as of 2014-02, we will manually add it to the available sources.
 -Installing Rust would take some time as it weighs about 120 MB.
 -
 -    > choco sources add -name nuget -source https://www.nuget.org/api/v2/
 -    > choco install Rust
 -
 -> TIP: If you get the "Unable to read package from path" error shortly after `choco install`,
 -> you have the incomplete NuGet package cache.
 -> Delete everything starting with `Rust` in `%AppData%\Local\NuGet\Cache` and try again.
 -
 -`choco install` would install `C:\Chocolatey\lib\Rust.VERSION\bin\rustc.exe` and so on.
 -Try `rustc -v` out in the Command Prompt and check if it installs the correct version.
 -
 -> TIP: If you get an error about not being able to find `libstdc++-6.dll` or other dlls when running `rustc`, install the `mingw32-gcc-g++` package from mingw as well.
 -
 -You can update the Rust installation using Chocolatey later.
 -
 -    > choco update Rust
 -
 -## Using with MSYS
 -
 -MinGW has a subsystem named MSYS which emulates a conventional Unix shell.
 -This subsystem is required for projects depending on Unix build systems like `make`,
 -and it's a must for building the Rust compiler.
 -
 -Follow all the instructions for MinGW, then type the following in order to install MSYS.
 -
 -    > mingw-get install msys-base
 -
 -Then run `msys\1.0\msys.bat` in the MinGW directory.
 -
 -> TIP: Installing MSYS does not automatically generate a shortcut to it. You are recommended to make a shortcut for `msys.bat`.
 -
 -> TIP: If you've installed MSYS in your own way, and especially if you don't have a path to MinGW in `PATH`,
 -> then you need to run `/postinstall/pi.sh` in the MSYS shell and follow the instructions. (You normally don't need that, however.)
 -
 -`rustc` installed via Chocolatey works well with MSYS,
 -but you can't directly run it since the MSYS shell (currently) can't run batch files generated by Chocolatey.
 -You need to make the following files in the MinGW directory by hand...
 -
 -* `msys\1.0\bin\rustc`
 -* `msys\1.0\bin\rustdoc`
 -* `msys\1.0\bin\rustpkg`
 -
 -...with the following contents.
 -
 -    #!/bin/sh
 -    cmd //c $(basename "$0") "$@" 
 -
 -You can now use `rustc` directly in the MSYS shell.
 +See [[Using-Rust-on-Windows]].
 diff --git a/Note-Building-Rust-Before-0.8-on-Windows-Systems.md b/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
 index 15ca828..0556f2c 100644
 --- a/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
 +++ b/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
 @@ -1,3 +1,5 @@
 +For current instructions on building Rust on Windows, see the guide to [[getting started developing Rust|Note-getting-started-developing-Rust]].
 +
 **Please note that this is an in-progress and temporary guide only intended for versions of Rust before 0.8 on Windows systems.**
 
 This temporary guide will cover building Rust < 0.8 on a Windows system through MSYS & MinGW using gcc 4.8 .
 diff --git a/Note-getting-started-developing-Rust.md b/Note-getting-started-developing-Rust.md
 index a716810..17afcfd 100644
 --- a/Note-getting-started-developing-Rust.md
 +++ b/Note-getting-started-developing-Rust.md
 @@ -47,21 +47,17 @@ Also, make sure you have the `lmodern` font package (see [#3989](https://github.
 
 ### Windows
 
 -Whether building from source or running the rustc binaries, see [[Using Rust on Windows]] for instructions on setting up MinGW.
 -
 -#### MSYS
 -
 -The MinGW linked to from the above "using Rust" instructions should also be sufficient for building Rust. Note though that to build Rust, we additionally require MSYS, a collection of Unix utilities ported to Windows. We currently recommend the inclusive version of MSYS provided by the [mingw-builds project](http://sourceforge.net/apps/trac/mingw-w64/wiki/MSYS). Extract these to a directory somewhere and make sure they are on your path when building Rust. Using the MSYS shell can also be slightly more pleasant than building directly from the windows terminal.
 +Whether building from source or running the rustc binaries, see [[Using Rust on Windows]] for instructions on setting up GCC and a POSIX environment.  Note that, as of August, 2014, you will need to install an MinGW-w64 build of GCC; the MinGW build will not suffice for building Rust.  You will also need to install MSYS2.
 
 #### More info for Windows users.
 
 -It is known that msys make freezes randomly i[f `-jN` option is given](http://sourceforge.net/mailarchive/message.php?msg_id=29801372).
 +It is known that msys make freezes randomly [if `-jN` option is given](http://sourceforge.net/mailarchive/message.php?msg_id=29801372).
 
 Once installed, we tend to work inside the MSYS shell.
 If you are a consistent user of MinGW or plan to be, you might also want to subscribe to their mailing list: [Mingw-users](https://lists.sourceforge.net/lists/listinfo/mingw-users)
 
 (OPTIONAL)
 -* Using `mingw-get` alone will open a GUI interface for package management.  You can update MinGW components once you start it's console by using the command `mingw-get update`, this updates the package repository for MinGW.  After which you can upgrade packages with `mingw-get upgrade`. **mingw-get upgrade will overwrite to latest versions of GCC as well, so you might have to upgrade to a lower version afterwards.**
 +* For MinGW, using `mingw-get` alone will open a GUI interface for package management.  You can update MinGW components once you start it's console by using the command `mingw-get update`, this updates the package repository for MinGW.  After which you can upgrade packages with `mingw-get upgrade`. **mingw-get upgrade will overwrite to latest versions of GCC as well, so you might have to upgrade to a lower version afterwards.**
 
 (OPTIONAL - if using another Git installer or method other than the Quick Steps):
 
 diff --git a/Using-Rust-on-Windows.md b/Using-Rust-on-Windows.md
 index d608c9e..ab7e3af 100644
 --- a/Using-Rust-on-Windows.md
 +++ b/Using-Rust-on-Windows.md
 @@ -1,15 +1,149 @@
 -As of release 0.10, Rust still depends on GCC for platform linker and C runtime libraries, so you will need to install one before installing Rust itself. Follow these instructions to set up the environment, then run the [Rust installer].
 +The Rust compiler depends on the GNU Compiler Collection for linking and its C runtime library.  As such, you will need to install some variety of GCC on Windows in order to compile Rust code.  Many Rust projects also require a POSIX build environment.  Once you have GCC (and, optionally, MSYS or equivalent) installed, read the "Installing and Verifying Rust" section.
 
 -## MinGW
 +## Acquiring GCC and a POSIX Environment
 
 -The current recommended way of obtaining Rust's prerequisites is by using the [mingw-w64 installers](http://sourceforge.net/projects/mingwbuilds/files/mingw-builds-install/mingw-builds-install.exe/download) from the [mingw-builds project](https://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/). The official Rust build bots are using such an installer from late March, 2014.
 +The short version of this section: **see "Use MSYS2 and MinGW-w64"**, or, if you wish to use `rustc` from *outside* an MSYS shell, see "Use MinGW-w64 outside of MSYS2".  **If you are intending to build Rust from source**, you should read this section as well as the guide to [[getting started developing Rust|Note-getting-started-developing-Rust]].
 
 -1. Download and run mingw-builds-install.exe.
 -2. Choose installation options: architecture=x32, **threads=win32**, exceptions=dwarf.
 -3. Now just download and run the [Rust installer].
 -3. Use Rust compiler from mingw-builds terminal (there will be a shortcut in the Start menu), or add `<mingw-builds>\mingw32\bin` directory to your PATH.
 -4. Verify Rust installation at mingw-builds terminal by typing `rustc --help`
 +There are three primary ways of obtaining GCC on Windows: MinGW, MinGW-w64 and Cygwin.
 
 -[Rust installer]: http://static.rust-lang.org/dist/rust-nightly-install.exe
 +* **MinGW** is a Windows-native port of GCC and other utilities.  The important property of MinGW is that its compilers (usually) produce standalone executables and libraries that can be used without end-users needing to install MinGW themselves.  It only supports building 32-bit binaries.
 
 -*Note: these instructions are sufficient to run Rust from a binary installation. To build Rust see [[further instructions|Note-getting-started-developing-Rust]].*
 \ No newline at end of file
 +* **MinGW-w64** is a clean-room re-implementation of MinGW originally created to provide support for building 64-bit Windows executables.  Despite the name, it *does* support creating 32-bit binaries.  Like MinGW, it also produces standalone binaries.
 +
 +* **Cygwin** is a POSIX layer written on top of the Windows API that (by and large) allows software written for POSIX to be compiled unmodified.  In addition to compilers, it also includes standard POSIX environment programs such as shell commands and the shell itself.  In essence, whereas MinGW is a port of some POSIX software, Cygwin is a port of a *complete POSIX environment*.  Unlike MinGW, however, all binaries compiled using Cygwin's tools will (usually) *require Cygwin components in order to run*.
 +
 +It is worth noting that there are exceptions to the above.  There are versions of MinGW which do not build entirely "native" executables, and it is possible to "cross-compile" using MinGW from inside Cygwin.
 +
 +At present, **Rust is designed to be used with a MinGW version of GCC** (that is, one that produces standalone executables).  Using Rust with Cygwin will not be covered by these instructions.
 +
 +In addition to Rust's dependence of GCC, a number of Rust projects require a POSIX shell environment to build, due to their use of shell scripts and/or Makefiles.  This requirement can be filled by Cygwin (keeping in mind the above about standalone binaries), MSYS or MSYS2.
 +
 +* **MSYS** is a part of the MinGW project which provides Windows-native ports of various POSIX tools including various common shell commands, the shell itself and `make`.  It is a fork of Cygwin, but does *not* have the same "tainting" effect on produced binaries that Cygwin does.
 +
 +* **MSYS2** is an updated version of MSYS, which exists independent of the MinGW and MinGW-w64 projects.  That said, MSYS2 has a package manager which supports installation of **MinGW-w64** within its own environment.
 +
 +It is recommended that, when compiling Rust projects that require a POSIX environment for the build system, you **use MSYS or MSYS2** rather than Cygwin.
 +
 +In practice, you should choose one of the following configurations:
 +
 +* **MSYS2** with **MinGW-w64** installed via the MSYS2 package manager.  This requires you to use `rustc` from within MSYS2.  The majority of developers working in Windows on the Rust compiler itself use this configuration, and it combines the most compatible GCC with the simplest setup.
 +
 +* **MinGW** with **MSYS** installed via the MinGW package manager.  `rustc` can be used both inside and outside the MSYS shell.  Note that, as of August, 2014, **Rust does not build with this configuration** due to incompatibilities with GCC.  This configuration is servicable for building *with* a pre-compiled `rustc`, however.
 +
 +* **MinGW-w64** installed to the system path, with **MSYS2** installed separately.  `rustc` can be used both inside and outside the MSYS shell.
 +
 +### Use MSYS2 and MinGW-w64
 +
 +These instructions are also summarised in `README.md` in the Rust source repository.
 +
 +Download and run the MSYS2 installer `msys2-(host platform)-(date).exe` from the [MSYS2 project page](http://sourceforge.net/projects/msys2/files/Base/) and follow the instructions.
 +
 +Once installed, you will need to launch the MSYS2 shell (this can be done from the Start Menu shortcut, or by running `msys2_shell.bat` from the install directory.  First, you will need to install the appropriate MinGW-w64 toolchain, depending on whether you wish to compile 32-bit and/or 64-bit binaries.  Note that you can install both if you so desire without them conflicting.
 +
 +    $ pacman -S mingw-w64-i686-toolchain    # for 32-bit builds
 +    $ pacman -S mingw-w64-x86_64-toolchain  # for 64-bit builds
 +
 +You will also need to install the rest of the POSIX tools for building software:
 +
 +    $ pacman -S base-devel
 +
 +In order to compile with Rust, you will need to start the MSYS2 shell from either the "MinGW-w64 Win32 Shell" or "MinGW-w64 Win64 Shell" Start Menu shortcuts, or the `mingw32_shell.bat` or `mingw64_shell.bat` batch files in the MSYS2 install directory, depending on which toolchain you wish to use.
 +
 +> **NOTE**: The MinGW-w64 shells change how MSYS2 identifies itself through the `uname` program.  Build systems which expect MinGW may fail if used from within a standard MSYS2 shell.
 +
 +See "Installing and Verifying Rust".
 +
 +### Use MinGW and MSYS
 +
 +**TODO**: verify these are all still correct.
 +
 +Download and run the MinGW installer [mingw-get-setup.exe](http://sourceforge.net/projects/mingw/files/latest/download?source=files) and follow the instructions.
 +There is a checkbox for whether to install the graphical user interface,
 +which we will not use but nevertheless may be useful.
 +
 +> **TIP**: You can install the GUI later using `mingw-get install mingw-get-gui`.
 +
 +MinGW, by default, does not append itself to the `PATH` environment variable.
 +Since running `rustc` requires GCC to be accessible on the path,
 +you should append a path to the MinGW executables to `PATH` in the control panel.
 +(In the default settings, the path would be `C:\MinGW\bin`.)
 +
 +Alternately, you can write a batch file that adds the MinGW `bin` directory to your `PATH` temporarily, and run this batch file before using `rustc`.  For example, it might contain the following:
 +
 +    @ECHO OFF
 +    ECHO Adding MinGW to PATH...
 +    SET PATH=C:\MinGW\bin;%PATH%
 +
 +To actually install GCC, open a command prompt which has MinGW's programs accessible on the path and type the following:
 +
 +    > mingw-get install mingw32-base
 +
 +> **TIP**: This will install the C compiler. If you don't want it, use `mingw-get install gcc` instead.
 +
 +> **TIP**: If you get an error about not being able to find `libstdc++-6.dll` or other dlls when running `rustc`, install the `mingw32-gcc-g++` package from mingw as well.
 +
 +If you need it, you can now install MSYS, using the following from a command prompt:
 +
 +    > mingw-get install msys-base
 +
 +You can now open an MSYS shell either by using the "MinGW Shell" Start Menu shortcut or by directly running `msys\1.0\msys.bat` in the MinGW directory.
 +
 +> **TIP**: If you've installed MSYS in your own way, and especially if you don't have a path to MinGW in `PATH`,
 +> then you need to run `/postinstall/pi.sh` in the MSYS shell and follow the instructions. (You normally don't need that, however.)
 +
 +See "Installing and Verifying Rust".
 +
 +### Use MinGW-w64 outside of MSYS2
 +
 +Download and run the MinGW-w64 installer from the [MinGW-w64 download page](http://mingw-w64.sourceforge.net/download.php#mingw-builds), under the "Mingw-builds project" heading.  During installation, you will be asked to choose from various alternatives.  The following settings are known to work as of August, 2014 for building Rust itself, although you may be able to use others:
 +
 +* (GCC) Version: 4.8.1
 +* (Target) Architecture: x32
 +* Threads: win32 - **Important**
 +* Exception: dwarf
 +* Build revision: 5
 +
 +MinGW-w64 does not append itself to the `PATH` environment variable.
 +Since running `rustc` requires GCC to be accessible on the path, you should append a path to the MinGW-w64 executables to `PATH` in the control panel.
 +Specifically, you should add the `mingw32\bin` or `mingw64\bin` directory in the install directory to `PATH`.
 +
 +Alternately, you can run the `mingwbuilds.bat` batch file in the install directory to open a configured command prompt.
 +
 +If you need it, you can now install MSYS2.  To do so, follow the instructions in the section on installing MSYS2 with MinGW-w64, but skip the step where you install the MinGW-w64 toolchain package.
 +
 +Once complete, you should be able to use `rustc` (and the installed MinGW-w64 tools) from both inside and outside an MSYS2 shell.
 +
 +> **IMPORTANT**: Even if you do not install MinGW-w64 from within MSYS2, `rustc` should *still* be used from within the special MinGW-w64 shells, *not* the standard MSYS2 shell.  This ensures the environment identifies itself as MinGW and *not* as MSYS.
 +
 +
 +
 +> **NOTE**: Using the MSYS2 MinGW-w64 shells can alter which specific install of MinGW-w64 is used.  The behaviour is as follows:
 +>
 +> * "MSYS2 Shell" / `msys2_shell.bat`: externally-installed MinGW-w64.
 +> * "MinGW-w64 Win32 Shell" / `mingw32_shell.bat`: MinGW-w64 targetting i686 as installed by the MSYS2 package manager (`mingw-w64-i686-toolchain`).  If that is not installed, will fall back to the externally-installed MinGW-w64.
 +> * "MinGW-w64 Win64 Shell" / `mingw64_shell.bat`: MinGW-w64 targetting x86-64 as installed by the MSYS2 package manager (`mingw-w64-x86_64-toolchain`).  If that is not installed, will fall back to the externally-installed MinGW-w64.
 +
 +See "Installing and Verifying Rust".
 +
 +## Installing and Verifying Rust
 +
 +The simplest way to get a precompiled version of `rustc` is to download the [nightly Rust installer] from the [Rust website].  This should be used unless you have code that requires an older release version of the language.
 +
 +[nightly Rust installer]: http://static.rust-lang.org/dist/rust-nightly-install.exe
 +[Rust website]: http://www.rust-lang.org/
 +
 +Once installed, ensure that `rustc` works by running the following from a command prompt:
 +
 +    > rustc --version
 +
 +You may also wish to compile and run a minimal test program to ensure that `rustc` can properly locate and use GCC.  Place the following into a file called `hello.rs`:
 +
 +    fn main() {
 +        println!("Hello, World!");
 +    }
 +
 +Compile it as follows:
 +
 +    rustc hello.rs
 +
 +And then run the resulting `hello.exe` executable.  Remember that, if you are using MSYS or MSYS2, you will likely need to run the result using `./hello` rather than just `hello`.
 \ No newline at end of file
diff --git a/Doc-how-to-install-an-unofficial-nightly-for-Windows.md b/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
diff --git a/gistfile1.diff b/gistfile1.diff
 Included both single diff and individual files.
diff --git a/Note-Building-Rust-Before-0.8-on-Windows-Systems.md b/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
diff --git a/Note-getting-started-developing-Rust.md b/Note-getting-started-developing-Rust.md
diff --git a/Using-Rust-on-Windows.md b/Using-Rust-on-Windows.md
	diff --git a/Doc-how-to-install-an-unofficial-nightly-for-Windows.md b/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
	index 6d53736..a54b87b 100644
	--- a/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
	+++ b/Doc-how-to-install-an-unofficial-nightly-for-Windows.md
	@@ -1,81 +1 @@
	-WARNING: Every nightly snapshot mentioned in this document is unofficial and not maintained by the Rust core team.
	-You are fully responsible for any problems due to the use of nightly snapshots.
	-
	-## Using with MinGW
	-
	-Download and run the [MinGW installer](http://sourceforge.net/projects/mingw/files/latest/download?source=files) and follow the instructions.
	-There is a checkbox for whether to install the graphical user interface,
	-which we will not use but nevertheless may be useful.
	-
	-> TIP: You can install the GUI later using `mingw-get install mingw-get-gui`.
	-
	-MinGW, by default, does not append itself to the `PATH` environment variable.
	-Since running `rustc` anywhere requires this environment variable,
	-you should append a path to the MinGW executables to `PATH` in the control panel.
	-(In the default settings, the path would be `C:\MinGW\bin`.)
	-
	-Turn the Command Prompt on and type the following.
	-
	- > mingw-get install mingw32-base
	-
	-> TIP: This would install the C compiler. If you don't want it, use `mingw-get install gcc` instead.
	-
	-Install [Chocolatey](http://chocolatey.org/)
	-by copying the command line in the website and pasting it into the Command Prompt.
	-
	- > @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%systemdrive%\chocolatey\bin
	-
	-> TIP: When you get an error (mostly due to older versions of PowerShell), use an [alternative method](https://github.com/chocolatey/chocolatey/wiki/Installation#wiki-powershell-through-batch-method) to install.
	-
	-Then install Rust using Chocolatey.
	-We will use the [NuGet Rust package](https://www.nuget.org/packages/Rust/) maintained by Heather.
	-Since NuGet is not a default package feed as of 2014-02, we will manually add it to the available sources.
	-Installing Rust would take some time as it weighs about 120 MB.
	-
	- > choco sources add -name nuget -source https://www.nuget.org/api/v2/
	- > choco install Rust
	-
	-> TIP: If you get the "Unable to read package from path" error shortly after `choco install`,
	-> you have the incomplete NuGet package cache.
	-> Delete everything starting with `Rust` in `%AppData%\Local\NuGet\Cache` and try again.
	-
	-`choco install` would install `C:\Chocolatey\lib\Rust.VERSION\bin\rustc.exe` and so on.
	-Try `rustc -v` out in the Command Prompt and check if it installs the correct version.
	-
	-> TIP: If you get an error about not being able to find `libstdc++-6.dll` or other dlls when running `rustc`, install the `mingw32-gcc-g++` package from mingw as well.
	-
	-You can update the Rust installation using Chocolatey later.
	-
	- > choco update Rust
	-
	-## Using with MSYS
	-
	-MinGW has a subsystem named MSYS which emulates a conventional Unix shell.
	-This subsystem is required for projects depending on Unix build systems like `make`,
	-and it's a must for building the Rust compiler.
	-
	-Follow all the instructions for MinGW, then type the following in order to install MSYS.
	-
	- > mingw-get install msys-base
	-
	-Then run `msys\1.0\msys.bat` in the MinGW directory.
	-
	-> TIP: Installing MSYS does not automatically generate a shortcut to it. You are recommended to make a shortcut for `msys.bat`.
	-
	-> TIP: If you've installed MSYS in your own way, and especially if you don't have a path to MinGW in `PATH`,
	-> then you need to run `/postinstall/pi.sh` in the MSYS shell and follow the instructions. (You normally don't need that, however.)
	-
	-`rustc` installed via Chocolatey works well with MSYS,
	-but you can't directly run it since the MSYS shell (currently) can't run batch files generated by Chocolatey.
	-You need to make the following files in the MinGW directory by hand...
	-
	-* `msys\1.0\bin\rustc`
	-* `msys\1.0\bin\rustdoc`
	-* `msys\1.0\bin\rustpkg`
	-
	-...with the following contents.
	-
	- #!/bin/sh
	- cmd //c $(basename "$0") "$@"
	-
	-You can now use `rustc` directly in the MSYS shell.
	+See [[Using-Rust-on-Windows]].
	diff --git a/Note-Building-Rust-Before-0.8-on-Windows-Systems.md b/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
	index 15ca828..0556f2c 100644
	--- a/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
	+++ b/Note-Building-Rust-Before-0.8-on-Windows-Systems.md
	@@ -1,3 +1,5 @@
	+For current instructions on building Rust on Windows, see the guide to [[getting started developing Rust\|Note-getting-started-developing-Rust]].
	+
	Please note that this is an in-progress and temporary guide only intended for versions of Rust before 0.8 on Windows systems.

	This temporary guide will cover building Rust < 0.8 on a Windows system through MSYS & MinGW using gcc 4.8 .
	diff --git a/Note-getting-started-developing-Rust.md b/Note-getting-started-developing-Rust.md
	index a716810..17afcfd 100644
	--- a/Note-getting-started-developing-Rust.md
	+++ b/Note-getting-started-developing-Rust.md
	@@ -47,21 +47,17 @@ Also, make sure you have the `lmodern` font package (see [#3989](https://github.

	### Windows

	-Whether building from source or running the rustc binaries, see [[Using Rust on Windows]] for instructions on setting up MinGW.
	-
	-#### MSYS
	-
	-The MinGW linked to from the above "using Rust" instructions should also be sufficient for building Rust. Note though that to build Rust, we additionally require MSYS, a collection of Unix utilities ported to Windows. We currently recommend the inclusive version of MSYS provided by the [mingw-builds project](http://sourceforge.net/apps/trac/mingw-w64/wiki/MSYS). Extract these to a directory somewhere and make sure they are on your path when building Rust. Using the MSYS shell can also be slightly more pleasant than building directly from the windows terminal.
	+Whether building from source or running the rustc binaries, see [[Using Rust on Windows]] for instructions on setting up GCC and a POSIX environment. Note that, as of August, 2014, you will need to install an MinGW-w64 build of GCC; the MinGW build will not suffice for building Rust. You will also need to install MSYS2.

	#### More info for Windows users.

	-It is known that msys make freezes randomly i[f `-jN` option is given](http://sourceforge.net/mailarchive/message.php?msg_id=29801372).
	+It is known that msys make freezes randomly [if `-jN` option is given](http://sourceforge.net/mailarchive/message.php?msg_id=29801372).

	Once installed, we tend to work inside the MSYS shell.
	If you are a consistent user of MinGW or plan to be, you might also want to subscribe to their mailing list: [Mingw-users](https://lists.sourceforge.net/lists/listinfo/mingw-users)

	(OPTIONAL)
	-* Using `mingw-get` alone will open a GUI interface for package management. You can update MinGW components once you start it's console by using the command `mingw-get update`, this updates the package repository for MinGW. After which you can upgrade packages with `mingw-get upgrade`. mingw-get upgrade will overwrite to latest versions of GCC as well, so you might have to upgrade to a lower version afterwards.
	+* For MinGW, using `mingw-get` alone will open a GUI interface for package management. You can update MinGW components once you start it's console by using the command `mingw-get update`, this updates the package repository for MinGW. After which you can upgrade packages with `mingw-get upgrade`. mingw-get upgrade will overwrite to latest versions of GCC as well, so you might have to upgrade to a lower version afterwards.

	(OPTIONAL - if using another Git installer or method other than the Quick Steps):

	diff --git a/Using-Rust-on-Windows.md b/Using-Rust-on-Windows.md
	index d608c9e..ab7e3af 100644
	--- a/Using-Rust-on-Windows.md
	+++ b/Using-Rust-on-Windows.md
	@@ -1,15 +1,149 @@
	-As of release 0.10, Rust still depends on GCC for platform linker and C runtime libraries, so you will need to install one before installing Rust itself. Follow these instructions to set up the environment, then run the [Rust installer].
	+The Rust compiler depends on the GNU Compiler Collection for linking and its C runtime library. As such, you will need to install some variety of GCC on Windows in order to compile Rust code. Many Rust projects also require a POSIX build environment. Once you have GCC (and, optionally, MSYS or equivalent) installed, read the "Installing and Verifying Rust" section.

	-## MinGW
	+## Acquiring GCC and a POSIX Environment

	-The current recommended way of obtaining Rust's prerequisites is by using the [mingw-w64 installers](http://sourceforge.net/projects/mingwbuilds/files/mingw-builds-install/mingw-builds-install.exe/download) from the [mingw-builds project](https://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/). The official Rust build bots are using such an installer from late March, 2014.
	+The short version of this section: see "Use MSYS2 and MinGW-w64", or, if you wish to use `rustc` from outside an MSYS shell, see "Use MinGW-w64 outside of MSYS2". If you are intending to build Rust from source, you should read this section as well as the guide to [[getting started developing Rust\|Note-getting-started-developing-Rust]].

	-1. Download and run mingw-builds-install.exe.
	-2. Choose installation options: architecture=x32, threads=win32, exceptions=dwarf.
	-3. Now just download and run the [Rust installer].
	-3. Use Rust compiler from mingw-builds terminal (there will be a shortcut in the Start menu), or add `<mingw-builds>\mingw32\bin` directory to your PATH.
	-4. Verify Rust installation at mingw-builds terminal by typing `rustc --help`
	+There are three primary ways of obtaining GCC on Windows: MinGW, MinGW-w64 and Cygwin.

	-[Rust installer]: http://static.rust-lang.org/dist/rust-nightly-install.exe
	+* MinGW is a Windows-native port of GCC and other utilities. The important property of MinGW is that its compilers (usually) produce standalone executables and libraries that can be used without end-users needing to install MinGW themselves. It only supports building 32-bit binaries.

	-Note: these instructions are sufficient to run Rust from a binary installation. To build Rust see [[further instructions\|Note-getting-started-developing-Rust]].
	\ No newline at end of file
	+* MinGW-w64 is a clean-room re-implementation of MinGW originally created to provide support for building 64-bit Windows executables. Despite the name, it does support creating 32-bit binaries. Like MinGW, it also produces standalone binaries.
	+
	+* Cygwin is a POSIX layer written on top of the Windows API that (by and large) allows software written for POSIX to be compiled unmodified. In addition to compilers, it also includes standard POSIX environment programs such as shell commands and the shell itself. In essence, whereas MinGW is a port of some POSIX software, Cygwin is a port of a complete POSIX environment. Unlike MinGW, however, all binaries compiled using Cygwin's tools will (usually) require Cygwin components in order to run.
	+
	+It is worth noting that there are exceptions to the above. There are versions of MinGW which do not build entirely "native" executables, and it is possible to "cross-compile" using MinGW from inside Cygwin.
	+
	+At present, Rust is designed to be used with a MinGW version of GCC (that is, one that produces standalone executables). Using Rust with Cygwin will not be covered by these instructions.
	+
	+In addition to Rust's dependence of GCC, a number of Rust projects require a POSIX shell environment to build, due to their use of shell scripts and/or Makefiles. This requirement can be filled by Cygwin (keeping in mind the above about standalone binaries), MSYS or MSYS2.
	+
	+* MSYS is a part of the MinGW project which provides Windows-native ports of various POSIX tools including various common shell commands, the shell itself and `make`. It is a fork of Cygwin, but does not have the same "tainting" effect on produced binaries that Cygwin does.
	+
	+* MSYS2 is an updated version of MSYS, which exists independent of the MinGW and MinGW-w64 projects. That said, MSYS2 has a package manager which supports installation of MinGW-w64 within its own environment.
	+
	+It is recommended that, when compiling Rust projects that require a POSIX environment for the build system, you use MSYS or MSYS2 rather than Cygwin.
	+
	+In practice, you should choose one of the following configurations:
	+
	+* MSYS2 with MinGW-w64 installed via the MSYS2 package manager. This requires you to use `rustc` from within MSYS2. The majority of developers working in Windows on the Rust compiler itself use this configuration, and it combines the most compatible GCC with the simplest setup.
	+
	+* MinGW with MSYS installed via the MinGW package manager. `rustc` can be used both inside and outside the MSYS shell. Note that, as of August, 2014, Rust does not build with this configuration due to incompatibilities with GCC. This configuration is servicable for building with a pre-compiled `rustc`, however.
	+
	+* MinGW-w64 installed to the system path, with MSYS2 installed separately. `rustc` can be used both inside and outside the MSYS shell.
	+
	+### Use MSYS2 and MinGW-w64
	+
	+These instructions are also summarised in `README.md` in the Rust source repository.
	+
	+Download and run the MSYS2 installer `msys2-(host platform)-(date).exe` from the [MSYS2 project page](http://sourceforge.net/projects/msys2/files/Base/) and follow the instructions.
	+
	+Once installed, you will need to launch the MSYS2 shell (this can be done from the Start Menu shortcut, or by running `msys2_shell.bat` from the install directory. First, you will need to install the appropriate MinGW-w64 toolchain, depending on whether you wish to compile 32-bit and/or 64-bit binaries. Note that you can install both if you so desire without them conflicting.
	+
	+ $ pacman -S mingw-w64-i686-toolchain # for 32-bit builds
	+ $ pacman -S mingw-w64-x86_64-toolchain # for 64-bit builds
	+
	+You will also need to install the rest of the POSIX tools for building software:
	+
	+ $ pacman -S base-devel
	+
	+In order to compile with Rust, you will need to start the MSYS2 shell from either the "MinGW-w64 Win32 Shell" or "MinGW-w64 Win64 Shell" Start Menu shortcuts, or the `mingw32_shell.bat` or `mingw64_shell.bat` batch files in the MSYS2 install directory, depending on which toolchain you wish to use.
	+
	+> NOTE: The MinGW-w64 shells change how MSYS2 identifies itself through the `uname` program. Build systems which expect MinGW may fail if used from within a standard MSYS2 shell.
	+
	+See "Installing and Verifying Rust".
	+
	+### Use MinGW and MSYS
	+
	+TODO: verify these are all still correct.
	+
	+Download and run the MinGW installer [mingw-get-setup.exe](http://sourceforge.net/projects/mingw/files/latest/download?source=files) and follow the instructions.
	+There is a checkbox for whether to install the graphical user interface,
	+which we will not use but nevertheless may be useful.
	+
	+> TIP: You can install the GUI later using `mingw-get install mingw-get-gui`.
	+
	+MinGW, by default, does not append itself to the `PATH` environment variable.
	+Since running `rustc` requires GCC to be accessible on the path,
	+you should append a path to the MinGW executables to `PATH` in the control panel.
	+(In the default settings, the path would be `C:\MinGW\bin`.)
	+
	+Alternately, you can write a batch file that adds the MinGW `bin` directory to your `PATH` temporarily, and run this batch file before using `rustc`. For example, it might contain the following:
	+
	+ @ECHO OFF
	+ ECHO Adding MinGW to PATH...
	+ SET PATH=C:\MinGW\bin;%PATH%
	+
	+To actually install GCC, open a command prompt which has MinGW's programs accessible on the path and type the following:
	+
	+ > mingw-get install mingw32-base
	+
	+> TIP: This will install the C compiler. If you don't want it, use `mingw-get install gcc` instead.
	+
	+> TIP: If you get an error about not being able to find `libstdc++-6.dll` or other dlls when running `rustc`, install the `mingw32-gcc-g++` package from mingw as well.
	+
	+If you need it, you can now install MSYS, using the following from a command prompt:
	+
	+ > mingw-get install msys-base
	+
	+You can now open an MSYS shell either by using the "MinGW Shell" Start Menu shortcut or by directly running `msys\1.0\msys.bat` in the MinGW directory.
	+
	+> TIP: If you've installed MSYS in your own way, and especially if you don't have a path to MinGW in `PATH`,
	+> then you need to run `/postinstall/pi.sh` in the MSYS shell and follow the instructions. (You normally don't need that, however.)
	+
	+See "Installing and Verifying Rust".
	+
	+### Use MinGW-w64 outside of MSYS2
	+
	+Download and run the MinGW-w64 installer from the [MinGW-w64 download page](http://mingw-w64.sourceforge.net/download.php#mingw-builds), under the "Mingw-builds project" heading. During installation, you will be asked to choose from various alternatives. The following settings are known to work as of August, 2014 for building Rust itself, although you may be able to use others:
	+
	+* (GCC) Version: 4.8.1
	+* (Target) Architecture: x32
	+* Threads: win32 - Important
	+* Exception: dwarf
	+* Build revision: 5
	+
	+MinGW-w64 does not append itself to the `PATH` environment variable.
	+Since running `rustc` requires GCC to be accessible on the path, you should append a path to the MinGW-w64 executables to `PATH` in the control panel.
	+Specifically, you should add the `mingw32\bin` or `mingw64\bin` directory in the install directory to `PATH`.
	+
	+Alternately, you can run the `mingwbuilds.bat` batch file in the install directory to open a configured command prompt.
	+
	+If you need it, you can now install MSYS2. To do so, follow the instructions in the section on installing MSYS2 with MinGW-w64, but skip the step where you install the MinGW-w64 toolchain package.
	+
	+Once complete, you should be able to use `rustc` (and the installed MinGW-w64 tools) from both inside and outside an MSYS2 shell.
	+
	+> IMPORTANT: Even if you do not install MinGW-w64 from within MSYS2, `rustc` should still be used from within the special MinGW-w64 shells, not the standard MSYS2 shell. This ensures the environment identifies itself as MinGW and not as MSYS.
	+
	+
	+
	+> NOTE: Using the MSYS2 MinGW-w64 shells can alter which specific install of MinGW-w64 is used. The behaviour is as follows:
	+>
	+> * "MSYS2 Shell" / `msys2_shell.bat`: externally-installed MinGW-w64.
	+> * "MinGW-w64 Win32 Shell" / `mingw32_shell.bat`: MinGW-w64 targetting i686 as installed by the MSYS2 package manager (`mingw-w64-i686-toolchain`). If that is not installed, will fall back to the externally-installed MinGW-w64.
	+> * "MinGW-w64 Win64 Shell" / `mingw64_shell.bat`: MinGW-w64 targetting x86-64 as installed by the MSYS2 package manager (`mingw-w64-x86_64-toolchain`). If that is not installed, will fall back to the externally-installed MinGW-w64.
	+
	+See "Installing and Verifying Rust".
	+
	+## Installing and Verifying Rust
	+
	+The simplest way to get a precompiled version of `rustc` is to download the [nightly Rust installer] from the [Rust website]. This should be used unless you have code that requires an older release version of the language.
	+
	+[nightly Rust installer]: http://static.rust-lang.org/dist/rust-nightly-install.exe
	+[Rust website]: http://www.rust-lang.org/
	+
	+Once installed, ensure that `rustc` works by running the following from a command prompt:
	+
	+ > rustc --version
	+
	+You may also wish to compile and run a minimal test program to ensure that `rustc` can properly locate and use GCC. Place the following into a file called `hello.rs`:
	+
	+ fn main() {
	+ println!("Hello, World!");
	+ }
	+
	+Compile it as follows:
	+
	+ rustc hello.rs
	+
	+And then run the resulting `hello.exe` executable. Remember that, if you are using MSYS or MSYS2, you will likely need to run the result using `./hello` rather than just `hello`.
	\ No newline at end of file