aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-03-16 14:19:59 -0700
committerAnders Broman <a.broman58@gmail.com>2018-03-17 05:05:54 +0000
commit535dd5cb6a5abfe36e4515b6cd1c3669ea50cbe0 (patch)
treeaad5a7b8a1906256336876b94a301b355e6e2713 /docbook/wsdg_src
parent2d15d7d51bce3599112c339c4272872b621b4561 (diff)
NSIS: Link to Npcap.
Mention Npcap on the WinPcap installer page and add a link to it. Update some other text and tell developers to use NSIS 3.0 while we're here. Change-Id: I64728f014f518439ba4a38eda7a283274d40fcdc Reviewed-on: https://code.wireshark.org/review/26515 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc10
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.asciidoc4
2 files changed, 5 insertions, 9 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index a66de7414d..76e0f0e36c 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -519,15 +519,11 @@ Note: You should have successfully built Wireshark
before doing the following.
If you want to build your own
-_Wireshark-win64-{wireshark-version}-myprotocol123.exe_,
-you'll need NSIS.
+_Wireshark-win32-{wireshark-version}-myprotocol123.exe_, you'll need
+NSIS. You can download it from http://nsis.sourceforge.net[].
-. 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. NSIS v3 is recommended and may be required
-in the future.
+64-bit versions of Wireshark. NSIS v3 is required.
Note: If you do not yet have a copy of vcredist_x86.exe or vcredist_x64.exe in _./wireshark-win**XX**-libs_ (where *_XX_* is 32 or 64) you will need to download the appropriate file and place it in _./wireshark-win**XX**-libs_ before starting this step.
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index bebdfb4d95..e7c269733c 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -1214,8 +1214,8 @@ needed to be installed, including all required DLLs, plugins, and supporting
files.
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:
+http://nsis.sourceforge.net[]. NSIS v3 is required. You can also install
+it using Chocolatey:
[source,cmd]
----