diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-22 22:51:54 -0500 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-03 23:45:36 +0000 |
| commit | 4a703e01f47d1127756dab5f43b53cc49179cf9f (patch) | |
| tree | d1fa2dc08009b177f748051bab8cee6b694f9fc4 /doc/wireshark.pod.template | |
| parent | fdfa24dab602cb3e0ac4a5c6cc3aa58755f6f707 (diff) | |
Check profile directory before personal directory for services and subnets file
Bug: 11228
Change-Id: Id8bcc51ff694ef9f2019bc7509e440021d049d22
Reviewed-on: https://code.wireshark.org/review/19735
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: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'doc/wireshark.pod.template')
| -rw-r--r-- | doc/wireshark.pod.template | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index a8ec549ccf..60307b3659 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -2656,6 +2656,8 @@ will not be consulted for capture filter name resolution. If an IPv4 address cannot be translated via name resolution (no exact match is found) then a partial match is attempted via the F<subnets> file. +Both the global F<subnets> file and personal F<subnets> files are used +if they exist. Each line of this file consists of an IPv4 address, a subnet mask length separated only by a / and a name separated by whitespace. While the address @@ -2725,6 +2727,8 @@ preferences file. =item Name Resolution (services) The F<services> file is used to translate port numbers into names. +Both the global F<services> file and personal F<services> files are used +if they exist. The file has the standard F<services> file syntax; each line contains one (service) name and one transport identifier separated by white space. The |