aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHadriel Kaplan <hadrielk@yahoo.com>2015-07-25 09:24:48 -0400
committerHadriel Kaplan <hadrielk@yahoo.com>2015-07-25 17:05:01 +0000
commit190e313e9d949a837a0b3c3fe027647b35c2f8be (patch)
tree62c25c82c240d5aff4ef24b582c40c08d937e3d9 /doc
parent3fc4a831e035604b0af14ed8a5c9f6596a3448d0 (diff)
DNS: move DNS name resolution pref to Name Resolution prefs
Move the boolean flag for using captured DNS packet info for name resolution to the Name Resolution preferences settings, as it was rather surprising to disable Name Resolution preferences and still have names being resolved. Also disble them all if the '-n' command line switch is used, and re-enable it for a 'd' character in the '-N' option. Bug: 10337 Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917 Reviewed-on: https://code.wireshark.org/review/9786 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/rawshark.pod2
-rw-r--r--doc/tshark.pod2
-rw-r--r--doc/wireshark.pod.template2
3 files changed, 6 insertions, 0 deletions
diff --git a/doc/rawshark.pod b/doc/rawshark.pod
index 66be74f9c6..be8f680c17 100644
--- a/doc/rawshark.pod
+++ b/doc/rawshark.pod
@@ -172,6 +172,8 @@ B<t> to enable transport-layer port number resolution
B<C> to enable concurrent (asynchronous) DNS lookups
+B<d> to enable resolution from captured DNS packets
+
=item -o E<lt>preferenceE<gt>:E<lt>valueE<gt>
Set a preference value, overriding the default value and any value read
diff --git a/doc/tshark.pod b/doc/tshark.pod
index 3b32d73b7e..0467dc1c0f 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -571,6 +571,8 @@ The argument is a string that may contain the letters:
B<C> to enable concurrent (asynchronous) DNS lookups
+B<d> to enable resolution from captured DNS packets
+
B<m> to enable MAC address resolution
B<n> to enable network address resolution
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index 347f4ea9ac..5deb1aca5b 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -470,6 +470,8 @@ B<t> to enable transport-layer port number resolution
B<C> to enable concurrent (asynchronous) DNS lookups
+B<d> to enable resolution from captured DNS packets
+
=item -o E<lt>preference/recent settingE<gt>
Set a preference or recent value, overriding the default value and any value