aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/tshark.pod12
-rw-r--r--doc/wireshark.pod.template12
-rw-r--r--docbook/release-notes.asciidoc2
3 files changed, 26 insertions, 0 deletions
diff --git a/doc/tshark.pod b/doc/tshark.pod
index 8278425246..3b32d73b7e 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -1529,6 +1529,18 @@ Add a capture comment to the output file.
This option is only available if a new output file in pcapng format is
created. Only one capture comment may be set per output file.
+=item --disable-protocol E<lt>proto_nameE<gt>
+
+Disable dissection of proto_name.
+
+=item --enable-heuristic E<lt>short_nameE<gt>
+
+Enable dissection of heuristic protocol.
+
+=item --disable-heuristic E<lt>short_nameE<gt>
+
+Disable dissection of heuristic protocol.
+
=back
=back
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index ee398dd477..347f4ea9ac 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -918,6 +918,18 @@ VoIP Calls.
Example: B<-z voip,calls>
+=item --disable-protocol E<lt>proto_nameE<gt>
+
+Disable dissection of proto_name.
+
+=item --enable-heuristic E<lt>short_nameE<gt>
+
+Enable dissection of heuristic protocol.
+
+=item --disable-heuristic E<lt>short_nameE<gt>
+
+Disable dissection of heuristic protocol.
+
=back
=back
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index e238c13393..ce86727d49 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -240,6 +240,8 @@ been completely removed in favour of wmem which is now fully mature.
* The (long-since-broken) Python bindings support has been removed. If
you want to write dissectors in something other than C, use Lua.
* Plugins can now create GUI menu items.
+* Heuristic dissectors can now be globally enabled/disabled so
+heur_dissector_add() has a few more parameters to make that possible
== Getting Wireshark