diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-01-02 12:33:49 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-01-02 20:52:22 +0000 |
commit | 970e7c192130de8fe0e0a01b4565f519e74b938e (patch) | |
tree | 62e0ee3a697da686c84de9336ac48240136fd419 | |
parent | 42baa9d8483351bc77f61cb382a7163c4e8cf6ad (diff) |
Try to clarify the PowerShell requirements.
Change-Id: Ie4ad0388b920ba4a8483ad8af351ddbdd121a28b
Reviewed-on: https://code.wireshark.org/review/6254
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc | 10 | ||||
-rw-r--r-- | docbook/wsdg_src/WSDG_chapter_tools.asciidoc | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc index b29efc98d3..6c0403bdc8 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc @@ -192,9 +192,13 @@ other packages are also used. ==== Install PowerShell -If you are running Windows Vista you may need to install Windows Powershell 2.0. -Later versions should also be supported. -You can download it from https://www.microsoft.com/powershell[] +PowerShell 2.0 or later is required for building Wireshark and the NSIS package. +Windows 7 and later include compatible versions. + +If you are running Windows Vista and have thus far managed to not install +PowerShell 2.0, either directly or via anything that requires it, you must now +install PowerShell 2.0. You can download it from +https://www.microsoft.com/powershell[] [[ChSetupChocolatey]] diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc index b70fe25fd5..029d308c20 100644 --- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc @@ -53,9 +53,13 @@ development tasks in <<ChapterSources>>. === Windows PowerShell -If you are running Windows Vista you may need to install at least Windows Powershell -2.0, although later versions will also work. -You can download it from https://www.microsoft.com/powershell[] +PowerShell 2.0 or later is required for building Wireshark and the NSIS package. +Windows 7 and later include compatible versions. + +If you are running Windows Vista and have thus far managed to not install +PowerShell 2.0, either directly or via anything that requires it, you must now +install PowerShell 2.0. You can download it from +https://www.microsoft.com/powershell[] === Chocolatey |