aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2015-11-01 21:07:42 +0000
committerMichael Mann <mmann78@netscape.net>2015-11-05 21:24:14 +0000
commit25e3a6c021d2c45284bb94ab93704f0a8938f2ee (patch)
tree15799a4de7dd61729431278ca916f5130b32e70a /docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
parent4ea610a54a0b41010337188e55e716e90aa315d5 (diff)
docs: Windows CMake builds
Updated the WSDG Windows build instructions to use CMake. Change-Id: I5006c07e09ec6f628e8bc44006a3f1086e831a3c Reviewed-on: https://code.wireshark.org/review/11485 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index db6dd102b0..8ff5d706c0 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -93,6 +93,8 @@ 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 8.1 / Windows Server 2012 R2
* Windows 8 / Windows Server 2012
@@ -103,6 +105,9 @@ available.
* 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.
+
[[ChIntroDevelopment]]
=== Development and maintenance of Wireshark