[gtk-web/windows-vcpkg] Restructure the Windows installation page

[Emmanuele Bassi <ebassi src gnome org>]

commit e2a8be9cc0779fd764d0f11c8ced86d4b6d64c07
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Mar 4 23:55:48 2020 +0000

    Restructure the Windows installation page
    
    The vcpkg build is definitely not recommended, as it may cease to work
    at any given moment. Let's put MSYS on top, and hopefully people will
    get the nudge.

 collections/_docs/windows.md | 155 +++++++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 79 deletions(-)
---
diff --git a/collections/_docs/windows.md b/collections/_docs/windows.md
index 84d1a17..dfb0717 100644
--- a/collections/_docs/windows.md
+++ b/collections/_docs/windows.md
@@ -25,27 +25,84 @@ There are many methods to install GTK on Windows development machines.
   which are built using Visual Studio, and therefore work well if you intend
   to develop using that platform.
 
-If you really want to build GTK from the pristine sources yourself, you can
-use the project files for Microsoft Visual Studio provided by the GTK
-releases. Learn more on [how to build the GTK stack using Microsoft Visual
-Studio](https://wiki.gnome.org/Projects/GTK/Win32/MSVCCompilationOfGTKStack)
-and read these other tips on [how to build GTK with MSVC on
-Windows](https://blogs.gnome.org/nacho/2015/02/19/building-gtk-3-with-msvc-2013/).
-In almost all cases, using the packages from `vcpkg` or `MSYS2` is much
-simpler though.
-
+<div class="alert alert-warning">
 We assume that you are using Windows 7 or later. For older versions of
 Windows, you will need to do a custom build of older versions of GLib and
 GTK.
+</div>
+
+## Using GTK from MSYS2 packages
+
+### Installation
+
+The [MSYS2](https://msys2.github.io/) project provides a UNIX-like
+development environment for Windows. It provides packages for many software
+applications and libraries, including the GTK stack. If you prefer
+developing using Visual Studio, you may be better off installing GTK from
+vcpkg instead.
+
+In MSYS2 packages are installed using the [pacman package
+manager](https://github.com/msys2/msys2/wiki/MSYS2-installation#iv-general-package-management).
+
+> Note: in the following steps, we will assume you're using a `64-bit
+> Windows`. Therefore, the package names include the x86\_64 architecture
+> identifier. If you're using a 32-bit Windows, please adapt the
+> instructions below using the i686 architecture identifier.
+
+**Step 1.**: Download the [MSYS2 installer](https://www.msys2.org/) that
+matches your platform and follow the installation instructions.
+
+**Step 2.**: Install GTK3 and its dependencies. Open a MSYS2 shell, and run:
+
+```
+pacman -S mingw-w64-x86_64-gtk3
+```
+
+**Step 3. (recommended)**: Install the GTK core applications. `Glade` is a
+GUI designer for GTK. It lets you design your GUI and export it in XML
+format. You can then import your GUI from your code using the GtkBuilder
+API. Read the GtkBuilder section in the GTK manual for more information.
+
+To install Glade:
+```
+pacman -S mingw-w64-x86_64-glade
+```
+
+`Devhelp` is a help browser. It lets you easily navigate offline in the GTK,
+glib and gobject API help relative to the version of these libraries
+installed on your system.
+
+To install Devhelp:
+```
+pacman -S mingw-w64-x86_64-devhelp
+```
+
+**Step 4. (optional)**: If you want to develop a GTK3 application in Python,
+you need to install the Python bindings.
+
+If you develop in Python 3:
+```
+pacman -S mingw-w64-x86_64-python3-gobject
+```
+
+If you develop in Python 2:
+```
+pacman -S mingw-w64-x86_64-python2-gobject
+```
+
+**Step 5. (optional)**: Install the build tools. If you want to develop a
+GTK3 application in other languages like C, C++, Fortran, etc, you'll need a
+compiler like gcc and other development tools: ``` pacman -S
+mingw-w64-x86_64-toolchain base-devel ```
 
 ## Using GTK from vcpkg packages
 
 <div class="alert alert-warning">
-WARNING: The `vcpkg` packaging is not maintained by the GTK team, and it uses
-a different build system than the one used by GTK. If something breaks when
-building GTK or its dependencies using `vcpkg`, make sure to open an issue in
-the [vcpkg issue tracker](https://github.com/Microsoft/vcpkg/issues), instead
-of the GTK one.
+WARNING: The `vcpkg` packaging is not maintained or supported by the GTK
+team, and it uses a different build system than the one used by GTK. If
+something breaks when building GTK or its dependencies using `vcpkg`, make
+sure to open an issue in the [vcpkg issue tracker](https://github.com/Microsoft/vcpkg/issues),
+instead of the GTK one.
 </div>
 
 ### Installation
@@ -74,7 +131,9 @@ libraries.
 If you build from the command line using `CMake`, you need to tell `CMake`
 where to find the libraries. This is done by adding 
 
-`-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake`
+```
+-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake
+```
 
 to the CMake options, where `vcpkg` root is the location where you cloned
 the `vcpkg` repository.
@@ -100,6 +159,7 @@ you can download from [the GNOME sources](https://download.gnome.org/sources/adw
 
 **Step 4.** To make GTK pick up this theme, put a file 
 `settings.ini` in `etc/gtk-3.0` in your installation folder. This should contain
+
 ```
 [Settings]
 gtk-theme-name=Windows10
@@ -108,6 +168,7 @@ gtk-font-name=Segoe UI 9
 
 **Step 5.** And to top it all off, run the `glib-compile-schemas` utility to
 generate the compiled settings schema in your installation folder:
+
 ```
 glib-compile-schemas share/glib-2.0/schemas
 ```
@@ -115,70 +176,6 @@ glib-compile-schemas share/glib-2.0/schemas
 **Step 6.** You can then zip up your installation folder, or use an installer
 generator to do that for you, and distribute the result.
 
-## Using GTK from MSYS2 packages
-
-### Installation
-
-The [MSYS2](https://msys2.github.io/) project provides a UNIX-like
-development environment for Windows. It provides packages for many software
-applications and libraries, including the GTK stack. If you prefer
-developing using Visual Studio, you may be better off installing GTK from
-vcpkg instead.
-
-In MSYS2 packages are installed using the [pacman package
-manager](https://github.com/msys2/msys2/wiki/MSYS2-installation#iv-general-package-management).
-
-> Note: in the following steps, we will assume you're using a `64-bit
-> Windows`. Therefore, the package names include the x86_64 architecture
-> identifier. If you're using a 32-bit Windows, please adapt the
-> instructions below using the i686 architecture identifier.
-
-**Step 1.**: Download the [MSYS2 installer](https://www.msys2.org/) that
-matches your platform and follow the installation instructions.
-
-**Step 2.**: Install GTK3 and its dependencies. Open a MSYS2 shell, and run:
-
-```
-pacman -S mingw-w64-x86_64-gtk3
-```
-
-**Step 3. (recommended)**: Install the GTK core applications. `Glade` is a
-GUI designer for GTK. It lets you design your GUI and export it in XML
-format. You can then import your GUI from your code using the GtkBuilder
-API. Read the GtkBuilder section in the GTK manual for more information.
-
-To install Glade:
-```
-pacman -S mingw-w64-x86_64-glade
-```
-
-`Devhelp` is a help browser. It lets you easily navigate offline in the GTK,
-glib and gobject API help relative to the version of these libraries
-installed on your system.
-
-To install Devhelp:
-```
-pacman -S mingw-w64-x86_64-devhelp
-```
-
-**Step 4. (optional)**: If you want to develop a GTK3 application in Python,
-you need to install the Python bindings.
-
-If you develop in Python 3:
-```
-pacman -S mingw-w64-x86_64-python3-gobject
-```
-
-If you develop in Python 2:
-```
-pacman -S mingw-w64-x86_64-python2-gobject
-```
-
-**Step 5. (optional)**: Install the build tools. If you want to develop a
-GTK3 application in other languages like C, C++, Fortran, etc, you'll need a
-compiler like gcc and other development tools: ``` pacman -S
-mingw-w64-x86_64-toolchain base-devel ```
-
 ### Building and distributing your application
 
 You may use MSYS2 to [build your GTK application and create an installer to