summaryrefslogtreecommitdiff
path: root/docbook/wsug_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@zing.org>2015-11-28 16:31:21 -0800
committerGerald Combs <gerald@wireshark.org>2015-11-29 18:09:27 +0000
commit5c620fff3dd6c278cdca4382b2cba2c5d0d35937 (patch)
tree8b5918a64c095d9c4345e6a60dc8b49622816b31 /docbook/wsug_src
parent6952c1c54ffe56f9c6402ce53ca4255dc9da82c1 (diff)
downloadwireshark-5c620fff3dd6c278cdca4382b2cba2c5d0d35937.tar.gz
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>
Diffstat (limited to 'docbook/wsug_src')
-rw-r--r--docbook/wsug_src/WSUG_app_files.asciidoc2
-rw-r--r--docbook/wsug_src/WSUG_chapter_introduction.asciidoc7
2 files changed, 5 insertions, 4 deletions
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.