diff --git a/web/content/docs/devguide/advanced/build-with-ninja.pandoc b/web/content/docs/devguide/advanced/build-with-ninja.pandoc
index 24d05babbed68f6a1981c0a87257cbbc8a2c0885..c072bedc45f0f6c9957bc9198d366631ae17a340 100644
--- a/web/content/docs/devguide/advanced/build-with-ninja.pandoc
+++ b/web/content/docs/devguide/advanced/build-with-ninja.pandoc
@@ -37,7 +37,7 @@ $ brew install ninja
 Run CMake with the ninja-generator:
 
 ```bash
-$ cmake ../source/dir -GNinja
+$ cmake ../source/dir -G Ninja
 $ ninja
 ```
 
diff --git a/web/content/docs/devguide/getting-started/build-configuration.pandoc b/web/content/docs/devguide/getting-started/build-configuration.pandoc
index b98b6a008b1b076f806572bb35ed6b4f93920337..142466cf87d3e554847a94d9ec9e3ba62e29a5fc 100644
--- a/web/content/docs/devguide/getting-started/build-configuration.pandoc
+++ b/web/content/docs/devguide/getting-started/build-configuration.pandoc
@@ -34,8 +34,7 @@ When you want to start over with a new configuration simply delete the build-dir
 ::: {.note}
 ### <i class="far fa-exclamation-triangle"></i> Supported Visual Studio Generators
 
-- `Visual Studio 15 2017 Win64` (preferred)
-- `Visual Studio 14 2015 Win64`
+- `Visual Studio 15 2017 Win64`
 
 :::
 :::
@@ -81,6 +80,22 @@ CMake tries to autodetect your compiler so in most cases this should be enough:
 $ cmake ../ogs
 ```
 
+::: {.note}
+#### <i class="far fa-check"></i> Pro Tip: Use the Visual Studio command line
+
+In the Start menu under *Visual Studio 2017* you find a application link to *x64 Native Tools Command Prompt for VS 2017*. This starts a command line setup for Visual Studio 64-bit. When you run CMake commands in this command line the correct generator will be picked up automatically:
+
+```bash
+cmake ../ogs
+```
+
+This even allows for using [Ninja]({{< ref "build-with-ninja.pandoc" >}}) as the build tool which can effectively utilize all CPU cores
+
+#### <i class="far fa-check"></i> Pro Tip 2: Use a better terminal application
+
+Use [ConEmu](https://conemu.github.io) for a better terminal experience. It automatically detects all installed terminal applications (e.g. regular Windows cmd.exe, Git shell, VS command lines, ...) and feautures multiple terminals inside tabs.
+:::
+
 ## Option: Configure with a visual tool
 
 ::: {.win}