15 files changed, 26 insertions, 22 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc b/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
index 1930a96123..84b05240bd 100644
--- a/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc
@@ -27,7 +27,7 @@ to handle dissection.
 
 There is little difference in having your dissector as either a plugin or
 built-in. On the Windows platform you have limited function access through the
-ABI exposed in 'libwireshark.def', but that is mostly complete.
+ABI exposed by functions declared as WS_DLL_PUBLIC.
 
 The big plus is that your rebuild cycle for a plugin is much shorter than for a
 built-in one. So starting with a plugin makes initial development simpler, while
@@ -172,21 +172,25 @@ are required, besides the dissector source in 'packet-foo.c':
 
 * 'Makefile.common' - Contains the file names of this plugin.
 
-* 'Makefile.nmake' - Contains the Wireshark plugin makefile for Windows.
+* 'CMakeLists.txt' - Contains the CMake file and version info for this plugin.
 
 * 'moduleinfo.h' - Contains plugin version information.
 
-* 'moduleinfo.nmake' - Contains DLL version info for Windows.
-
 * 'packet-foo.c' - Your dissector source.
 
 * 'plugin.rc.in' - Contains the DLL resource template for Windows.
 
-You can find a good example for these files in the interlink plugin directory.
+You can find a good example for these files in the gryphon plugin directory.
 'Makefile.common' and 'Makefile.am' have to be modified to reflect the relevant
-files and dissector name. 'moduleinfo.h' and 'moduleinfo.nmake' have to be
-filled in with the version information. Compile the dissector to a DLL or shared
-library and copy it into the plugin directory of the installation.
+files and dissector name. 'CMakeLists.txt' has to be modified with the correct
+plugin name and version info, along with the relevant files to compile.
+In the main top-level source directory, copy CMakeListsCustom.txt.example to
+CMakeCustomLists.txt and add the path of your plugin to the list in
+CUSTOM_PLUGIN_SRC_DIR.
+
+Compile the dissector to a DLL or shared library and either run Wireshark from
+the build directory as detailed in <<ChSrcRunFirstTime>> or copy the plugin
+binary into the plugin directory of your Wireshark installation and run that.
 
 [[ChDissectDetails]]
 
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 48c1089a4f..331fb15e87 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(docsis 0 0 5 0)
 
 # The sources for the plugin
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 446885241c..0821987753 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(ethercat 0 1 0 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 8080548204..b3342ccdd5 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(gryphon 0 0 4 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index ad10505e9d..89fbe87588 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(irda 0 0 6 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index ed6c423dd4..4ae3d746ea 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(m2m 1 1 0 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 666dd1b240..6f3c35aa61 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(mate 1 0 0 1)
 
 set(DISSECTOR_SRC
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index 812e92fb5a..f78b16d536 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(opcua 1 0 0 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 2dc6139430..73bdbc4b76 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(profinet 0 2 4 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index b7a4e60a47..e0d1dbcc28 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(stats_tree 0 0 1 0)
 
 set(PLUGIN_FILES
diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt
index 61bde02392..adc99729b4 100644
--- a/plugins/tpg/CMakeLists.txt
+++ b/plugins/tpg/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# XXX No moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 # set_plugin_properties(tpg ...)
 
 set(PLUGIN_FILES
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 0725c3f4ea..e0f742452b 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(unistim 0 0 2 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index 77af623ba9..13bf8dc02f 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(wimax 1 1 0 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index d3b7819752..b31ac156ba 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(wimaxasncp 0 0 1 0)
 
 set(DISSECTOR_SRC
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index 49b32df350..bbcd447237 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 include(WiresharkPlugin)
 
-# This info is from moduleinfo.nmake
+# Plugin name and version info (major minor micro extra)
 set_module_info(wimaxmacphy 0 0 1 0)
 
 set(DISSECTOR_SRC