diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-30 16:30:45 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-31 09:04:13 +0000 |
| commit | 52d62a60017be02ac7b1dec16c2048f7534083f8 (patch) | |
| tree | ea7ce7319ad5059ae3c48d4e64cbd8f6b222b7ed /docbook | |
| parent | 58fb6e1acd67957eefa27de96c8ddb7de612e1e7 (diff) | |
| download | wireshark-52d62a60017be02ac7b1dec16c2048f7534083f8.tar.gz | |
WSDG: Update some of the NSIS text.
Recommend v3 instead of v2.
Change-Id: I13260611dd6b12372aba8938a87574cd9a8e1a47
Reviewed-on: https://code.wireshark.org/review/19880
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc | 3 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.asciidoc | 8 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_tools.asciidoc | 7 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc index d1040795c8..2f0508428a 100644 --- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc @@ -546,7 +546,8 @@ you'll need NSIS. http://nsis.sourceforge.net[Download] and install NSIS + Note that the 32-bit version of NSIS will work for both 32-bit and -64-bit versions of Wireshark. +64-bit versions of Wireshark. NSIS v3 is recommended and may be required +in the future. Note: If you do not yet have a copy of vcredist_x86.exe or vcredist_x64.exe in ./wireshark-winXX-libs (where XX is 32 or 64) you will need to download the appropriate file and place it in ./wireshark-winXX-libs before starting this step. diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc index bd8dd1cdb8..0fe48cfac4 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc @@ -1073,10 +1073,10 @@ to build the OS X Package. ==== Win32: NSIS .exe installer -The _Nullsoft Install System_ is a free installer generator for Win32 -based systems; instructions how to install it can be found in <<ChToolsNSIS>>. -NSIS is script based, you will find the Wireshark installer -generation script at: 'packaging/nsis/wireshark.nsi'. +The _Nullsoft Install System_ is a free installer generator for Windows +systems. Instructions on installing it can be found in <<ChToolsNSIS>>. +NSIS is script based. You can find the main Wireshark installer +generation script at 'packaging/nsis/wireshark.nsi'. When building with CMake you must first build the 'nsis_package_prep' target, followed by the 'nsis_package' target, e.g. diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc index 99506a7391..2f412ec650 100644 --- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc @@ -1145,10 +1145,9 @@ The NSIS (Nullsoft Scriptable Install System) is used to generate needed to be installed, including all required DLLs, plugins, and supporting files. -To install it, download the latest released version (currently 2.46) from -http://nsis.sourceforge.net[] and start the downloaded installer. You will -need NSIS version 2. Version 3 is not yet supported. You can also install it -using Chocolatey: +To install it, download the latest released version from +http://nsis.sourceforge.net[]. NSIS v3 is recommended and may be +required in the future. You can also install it using Chocolatey: ---- PS$> choco install nsis |