From 766284a95fc9fd3d3da89998a502feb854a3f091 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <github@tc84.de>
Date: Thu, 20 Aug 2015 15:59:36 +0200
Subject: [PATCH] Use official name of Windows Server 2016.

Use the official name of Windows Server 2016 in wxGetOsDescription() and add it to the Windows versions table in the documentation.
---
 interface/wx/utils.h | 1 +
 src/msw/utils.cpp    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/wx/utils.h b/interface/wx/utils.h
index d2f5e17aac..fd1f2d1f32 100644
--- a/interface/wx/utils.h
+++ b/interface/wx/utils.h
@@ -858,6 +858,7 @@ wxString wxGetOsDescription();
     @beginTable
     @row3col{<b>Windows OS name</b>, <b>Major version</b>, <b>Minor version</b>}
     @row3col{Windows 10,               10, 0}
+    @row3col{Windows Server 2016,      10, 0}
     @row3col{Windows 8.1,               6, 3}
     @row3col{Windows Server 2012 R2,    6, 3}
     @row3col{Windows 8,                 6, 2}
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 6bf4441701..88bb5ddc52 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1226,7 +1226,7 @@ wxString wxGetOsDescription()
 
                 case 10:
                     str = wxIsWindowsServer() == 1
-                            ? _("Windows Server 10")
+                            ? _("Windows Server 2016")
                             : _("Windows 10");
                     break;
             }