Docs: Edited Windows install instructions (grafana#20780)

* Edited Windows install instructions

Moved one section from Windows install guide to developer-guide.md. Edited some content in windows.md and will add questions.

* Updated per comments

* Fixed broken links in basic_concepts.md

* Revert "Fixed broken links in basic_concepts.md"

This reverts commit e524ea9.

* Update windows.md

Author: oddlittlebird

contribute/developer-guide.md

@@ -72,6 +72,10 @@ Log in using the default credentials:
 
 When you log in for the first time, Grafana asks you to change your password.
 
+#### Building on Windows
+
+The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download).
+
 ## Test Grafana
 
 The test suite consists of three types of tests: _Frontend tests_, _backend tests_, and _end-to-end tests_.

docs/sources/installation/requirements.md

@@ -1,5 +1,5 @@
 +++
-title = "Installing on Windows"
+title = "Install on Windows"
 description = "Installing Grafana on Windows"
 keywords = ["grafana", "configuration", "documentation", "windows"]
 type = "docs"
@@ -8,46 +8,33 @@ parent = "installation"
 weight = 400
 +++
 
-# Installing on Windows
+# Install on Windows
 
-Description | Download
------------- | -------------
-Latest stable package for Windows | [x64](https://grafana.com/grafana/download?platform=windows)
+[Download the latest stable package for Windows.](https://grafana.com/grafana/download?platform=windows)
+
+You can either download the Windows installer package or a standalone Windows binary file.
 
 Read [Upgrading Grafana]({{< relref "upgrading.md" >}}) for tips and guidance on updating an existing
 installation.
 
-## Configure
-
-**Important:** After you've downloaded the zip file and before extracting it, make sure to open properties for that file (right-click Properties) and check the `unblock` checkbox and `Ok`.
-
-The zip file contains a folder with the current Grafana version. Extract
-this folder to anywhere you want Grafana to run from.  Go into the
-`conf` directory and copy `sample.ini` to `custom.ini`. You should edit
-`custom.ini`, never `defaults.ini`.
-
-The default Grafana port is `3000`, this port requires extra permissions
-on Windows. Edit `custom.ini` and uncomment the `http_port`
-configuration option (`;` is the comment character in ini files) and change it to something like `8080` or similar.
-That port should not require extra Windows privileges.
+## Install with Windows installer
 
-Default login and password `admin`/ `admin`
+Download the .msi installation file and run it, then follow the instructions in [Getting Started](/guides/getting_started/) to log in. The Grafana service starts automatically.
 
+## Install standalone Windows binary
 
-Start Grafana by executing `grafana-server.exe`, located in the `bin` directory, preferably from the
-command line. If you want to run Grafana as Windows service, download
-[NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows
-service using that tool.
+1. Download the zip file. The zip file contains a folder with the current Grafana version (or the one that you chose).
 
-Read more about the [configuration options]({{< relref "configuration.md" >}}).
+   **Important:** After you've downloaded the zip file and before extracting it, make sure to open the properties for that file (right-click **Properties**) and select the `unblock` check box and then click `Ok`.
 
-## Logging in for the first time
+1. Extract this folder to anywhere you want Grafana to run from. 
 
-To run Grafana open your browser and go to the port you configured above, e.g. http://localhost:8080/.
-Then follow the instructions [here]({{< relref "../guides/getting_started/" >}}).
+1. Start Grafana by executing `grafana-server.exe`, located in the `bin` directory, preferably from the command line. If you want to run Grafana as a Windows service, then download
+[NSSM](https://nssm.cc/). It is very easy to add Grafana as a Windows service using that tool.
 
-## Building on Windows
+To run Grafana open your browser and go to the Grafana port (http://localhost:3000/ is default) and then follow the instructions in [Getting Started](/guides/getting_started/).
 
-The Grafana backend includes Sqlite3 which requires GCC to compile. So
-in order to compile Grafana on Windows you need to install GCC. We
-recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download).
+> **Note:** The default Grafana port is `3000`. This port might require extra permissions on Windows. If it does not appear in the default port, you can try changing to a different port.
+> 1. Go into the `conf` directory and copy `sample.ini` to `custom.ini`. **Note:** You should edit `custom.ini`, never `defaults.ini`.
+> 1.  Edit `custom.ini` and uncomment the `http_port` configuration option (`;` is the comment character in ini files) and change it to something like `8080` or similar. That port should not require extra Windows privileges.
+> Read more about the [configuration options]({{< relref "configuration.md" >}}).