aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUli Heilmeier <uh@heilmeier.eu>2019-05-27 21:51:07 +0200
committerAnders Broman <a.broman58@gmail.com>2019-05-28 03:32:35 +0000
commitd4836d1efe13cc25659e728263c08cc0f8116b43 (patch)
tree64e6ebb95b0089b4a0e9ee33d6c3173c1bf551d5
parentb9c69d6ef8b2c759bb1b4be05240bba42038a051 (diff)
WSUG: Update vlan resolving
Update documentation to profile aware vlans file. Change-Id: I210964528663bdf7e3e20e623eda1d93a26f7486 Ping-Bug: 15795 Reviewed-on: https://code.wireshark.org/review/33387 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--docbook/wsug_src/WSUG_app_files.adoc7
1 files changed, 3 insertions, 4 deletions
diff --git a/docbook/wsug_src/WSUG_app_files.adoc b/docbook/wsug_src/WSUG_app_files.adoc
index 7365028ce5..a9ae1425ba 100644
--- a/docbook/wsug_src/WSUG_app_files.adoc
+++ b/docbook/wsug_src/WSUG_app_files.adoc
@@ -431,8 +431,7 @@ be translated to a name, and never written by Wireshark.
_vlans_::
Wireshark uses the _vlans_ file to translate VLAN tag IDs into names.
+
-At program start, if there is a _vlans_ file in the personal
-configuration folder, it is read.
+If there is a _vlans_ file in the currently active profile folder, it is used. Otherwise the _vlans_ file in the personal configuration folder is used.
+
--
Each line in this file consists of one VLAN tag ID and a describing name separated by whitespace or tab.
@@ -443,8 +442,8 @@ An example is:
2049 HR-Client-LAN
----
-The settings from this file are read in at program start and never written by
-Wireshark.
+The settings from this file are read in at program start or when changing
+the active profile and are never written by Wireshark.
--
_ss7pcs_::