Add documentation for new enable/disable protocol and heuristic dissector options.

Change-Id: Ia31326105cf559c2196d45369270552fb78da6c7
Reviewed-on: https://code.wireshark.org/review/9692
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

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

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

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