From 8fa711082c2b89207b1edf4a700ac06bcaddaef9 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 12 Mar 2014 16:16:59 +0100
Subject: [PATCH] Documentation: Add Vagrant on Windows, refactor Vagrant
 section.

Fixes #5569
---
 doc/9-vagrant-demo-vm.md | 51 ++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/doc/9-vagrant-demo-vm.md b/doc/9-vagrant-demo-vm.md
index 808f50d06..62f5428a2 100644
--- a/doc/9-vagrant-demo-vm.md
+++ b/doc/9-vagrant-demo-vm.md
@@ -18,20 +18,51 @@ following command:
 > required to be installed (for example from [http://downloads.vagrantup.com](http://downloads.vagrantup.com)).
 
 The Vagrant VM is based on CentOS 6.4 and uses the official Icinga 2 RPM
-packages from `packages.icinga.org`.
+packages from `packages.icinga.org`. The check plugins are installed from
+EPEL providing RPMs with sources from the Monitoring Plugins project.
 
-In addition to installing Icinga 2 the Vagrant script also installs the Icinga
-1.x Classic UI and the check plugins that are available from the Monitoring Plugins
-project.
+SSH login is available using `vagrant ssh`.
 
-The Classic UI is available at [http://localhost:8080/icinga](http://localhost:8080/icinga).
-By default both the username and password are `icingaadmin`.
+## <a id="vagrant-demo-guis"></a> Vagrant Demo GUIs
 
-An instance of icinga-web is installed at [http://localhost:8080/icinga-web](http://localhost:8080/icinga-web).
-The username is `root` and the password is `password`.
+In addition to installing Icinga 2 the Vagrant puppet modules also install the
+Icinga 1.x Classic UI and Icinga Web.
+
+  GUI             | Url                                                                  | Credentials
+  ----------------|----------------------------------------------------------------------|------------------------
+  Classic UI      | [http://localhost:8080/icinga](http://localhost:8080/icinga)         | icingaadmin/icingaadmin
+  Icinga Web      | [http://localhost:8080/icinga-web](http://localhost:8080/icinga-web) | root/password
 
-SSH login is available using `vagrant ssh`.
 
 ## <a id="vagrant-windows"></a> Vagrant on Windows
 
-TODO
+You need to install [VirtualBox](#https://www.virtualbox.org/wiki/Downloads)
+next to [Vagrant for Windows](#http://www.vagrantup.com/downloads.html). For SSH access
+you need to install [Git for Windows](#http://git-scm.com/download/win) too.
+
+Either download and extract the Icinga 2 tarball (or git archive) or clone the
+git repository using your preferred git gui.
+
+Open the Windows command prompt (cmd+R) and change the directory to your
+Icinga 2 directory containing the `Vagrantfile` file and start the Vagrant box.
+
+    c:> cd C:\Users\admin\icinga2
+    c:> vagrant up
+
+> **Note**
+>
+> If SSH access is not working, you may need to add the Git binary path to the system path.
+
+    c:> set PATH=%PATH%;C:\Program Files (x86)\Git\bin
+    c:> vagrant ssh
+
+For manual SSH access using [Putty](#http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
+you'll need the following default credentials:
+
+  Name            |Value
+  ----------------|----------------
+  hostname        | 127.0.0.1
+  port            | 2222
+  connection type | ssh
+  username        | vagrant
+  password        | vagrant
\ No newline at end of file
-- 
2.40.0