Docbook: We no longer support Windows Server 2003.

Try to clarify 2003 and XP support in the User's and Developer's guides.

Change-Id: Id08b21374485bf7655b83bb20b7c3d70f8871499
Reviewed-on: https://code.wireshark.org/review/12275
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5c620fff3dd6c278cdca4382b2cba2c5d0d35937)
Reviewed-on: https://code.wireshark.org/review/12289

3 files changed, 18 insertions, 25 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index a5518bd5b6..40e56f9f6f 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -81,19 +81,14 @@ others:
 
 ==== Microsoft Windows
 
-Thanks to the Win32 API, development on all Windows platforms will be
-done in a very similar way. All Windows platforms referred to as Win32,
-Win or Windows may be used with the same meaning.
-Older Windows versions are no longer supported by Wireshark.
-As Windows CE differs a lot compared to the other Windows platforms
-mentioned, Wireshark will not run on Windows CE and there are no plans to
-support it.
+Wireshark supports Windows natively via the
+https://en.wikipedia.org/wiki/Windows_API[Windows API]. Note that in
+this documentation and elsewhere we tend to use the terms
+``Win32'', ``Win'', and ``Windows'' interchangeably to refer to the
+Windows API. Wireshark runs on and can be compiled on the following
+platforms:
 
-Also the 64 bit Windows version are now supported by Wireshark. Although
-not all libraries are made 64 bit ready yet, basic operations are all
-available.
-
-* Windows 10
+* Windows 10 / Windows Server 2016
 
 * Windows 8.1 / Windows Server 2012 R2
 
@@ -103,10 +98,8 @@ available.
 
 * Windows Vista / Windows Server 2008
 
-* Windows XP / Windows Server 2003
-
-Support for XP / Server 2003 is best efforts for Wireshark 2.0 and later, it may fail to run
-at any time due to 3rd party library compatibility.
+Development on Windows XP, Server 2003, and older versions may be possible but
+is not supported.
 
 [[ChIntroDevelopment]]
 
@@ -194,11 +187,10 @@ wireshark-download-page:[].
 
 === Releases and distributions
 
-The officially released files can be found at: wireshark-download-page:[].  A new Wireshark version is released after
-significant changes compared to the last release are completed or a
-serious security issue is encountered. The typical release schedule is
-about every 4-8 weeks (although this may vary).
-
+The officially released files can be found at: wireshark-download-page:[]. A new
+Wireshark version is released after significant changes compared to the last
+release are completed or a serious security issue is encountered. The typical
+release schedule is about every 4-8 weeks (although this may vary).
 There are two kinds of distributions: binary and source; both have their
 advantages and disadvantages.
 
diff --git a/docbook/wsug_src/WSUG_app_files.asciidoc b/docbook/wsug_src/WSUG_app_files.asciidoc
index a6bb23e877..cd81d6bd2c 100644
--- a/docbook/wsug_src/WSUG_app_files.asciidoc
+++ b/docbook/wsug_src/WSUG_app_files.asciidoc
@@ -533,7 +533,7 @@ variable. This variable will be set by the Windows installer.
 Windows 8, Windows 7, Windows Vista, and associated server editions::
 _C:\Users\<username>\AppData\Local\Temp_
 
-Windows XP, Windows 2000 footnoteref:[historical]::
+Windows XP, Windows Server 2003, Windows 2000 footnoteref:[historical]::
 _C:\Documents and Settings\<username>\Local Settings\Temp_
 
 Windows NT footnoteref:[historical]::
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
index 9f8be111bd..6123db51c3 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
@@ -156,7 +156,7 @@ is single-threaded and won't benefit much from multi-core systems.
 * The current version of Wireshark should support any version of Windows that is
   still within its http://windows.microsoft.com/en-us/windows/lifecycle[extended
   support lifetime]. At the time of writing this includes Windows 10, 8, 7, Vista,
-  Server 2016, Server 2012, Server 2008 R2, Server 2008, and Server 2003.
+  Server 2016, Server 2012, Server 2008 R2, and Server 2008.
 
 * Any modern 64-bit AMD64/x86-64 or 32-bit x86 processor.
 
@@ -188,8 +188,9 @@ party libraries on which we depend or due to necessary features that are only
 present in newer versions of Windows (such as hardened security or memory
 management).
 
-Wireshark 1.10 was the last release branch to officially support Windows XP.
-Wireshark 1.2 was the last branch to support Windows 2000. See the
+Wireshark 1.12 was the last release branch to support Windows Server 2003.
+Wireshark 1.10 was the last branch to officially support Windows XP.
+See the
 wireshark-wiki-site:[]Development/LifeCycle[Wireshark release lifecycle] page
 for more details.