Improve name resolution preference tooltips.

Change the tooltips texts to make them better describe the preference.

Bug: 13130
Bug: 13131
Change-Id: Ie753e3703a702bdafed91cf0f41b306347088526
Reviewed-on: https://code.wireshark.org/review/18878
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

3 files changed, 25 insertions, 24 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 1796504c67..dede4efbfc 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -1904,8 +1904,8 @@ initialize_vlans(void)
     g_assert(vlan_hash_table == NULL);
     vlan_hash_table = wmem_map_new(wmem_epan_scope(), g_int_hash, g_int_equal);
 
-    /* Set g_pipxnets_path here, but don't actually do anything
-     * with it. It's used in get_ipxnetbyname() and get_ipxnetbyaddr()
+    /* Set g_pvlan_path here, but don't actually do anything
+     * with it. It's used in get_vlannamebyid()
      */
     if (g_pvlan_path == NULL)
         g_pvlan_path = get_persconffile_path(ENAME_VLANS, FALSE);
@@ -2456,7 +2456,8 @@ addr_resolve_pref_init(module_t *nameres)
 {
     prefs_register_bool_preference(nameres, "mac_name",
             "Resolve MAC addresses",
-            "Resolve Ethernet MAC address to manufacturer names",
+            "Resolve Ethernet MAC addresses to host names from the preferences"
+            " or system's Ethers file, or to a manufacturer based name.",
             &gbl_resolv_flags.mac_name);
 
     prefs_register_bool_preference(nameres, "transport_name",
@@ -2511,21 +2512,17 @@ addr_resolve_pref_init(module_t *nameres)
 
     prefs_register_bool_preference(nameres, "vlan_name",
             "Resolve VLAN IDs",
-            "Resolve VLAN IDs to describing names."
-            " To do so you need a file called vlans in your"
-            " user preference directory. Format of the file is:"
-            "  \"ID<Tab>Name\""
-            " One line per VLAN.",
+            "Resolve VLAN IDs to network names from the preferences \"vlans\" file."
+            " Format of the file is: \"ID<Tab>Name\"."
+            " One line per VLAN, e.g.: 1 Management",
             &gbl_resolv_flags.vlan_name);
 
     prefs_register_bool_preference(nameres, "ss7_pc_name",
-        "Resolve SS7 PCs",
-        "Resolve SS7 Point Codes to describing names."
-        " To do so you need a file called ss7pcs in your"
-        " user preference directory. Format of the file is:"
-        "  \"Network_Indicator<Dash>PC_Decimal<Tab>Name\""
-        " One line per Point Code. e.g.: 2-1234 MyPointCode1",
-        &gbl_resolv_flags.ss7pc_name);
+            "Resolve SS7 PCs",
+            "Resolve SS7 Point Codes to node names from the profiles \"ss7pcs\" file."
+            " Format of the file is: \"Network_Indicator<Dash>PC_Decimal<Tab>Name\"."
+            " One line per Point Code, e.g.: 2-1234 MyPointCode1",
+            &gbl_resolv_flags.ss7pc_name);
 
 }
 
diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index d22c439794..3be70713a2 100644
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -233,9 +233,9 @@ geoip_db_pref_init(module_t *nameres)
     prefs_register_uat_preference(nameres,
             "geoip_db_paths",
             "GeoIP database directories",
-                "Search paths for GeoIP address mapping databases.\n"
-                "Wireshark will look in each directory for files beginning\n"
-                "with \"Geo\" and ending with \".dat\".",
+            "Search paths for GeoIP address mapping databases."
+            " Wireshark will look in each directory for files beginning"
+            " with \"Geo\" and ending with \".dat\".",
             geoip_db_paths_uat);
 }
 
diff --git a/epan/oids.c b/epan/oids.c
index a9b69c41e4..23887ddb5a 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -761,12 +761,16 @@ void oid_pref_init(module_t *nameres)
 
     prefs_register_bool_preference(nameres, "load_smi_modules",
                                   "Enable OID resolution",
-                                  "You must restart Wireshark for this change to take effect",
+                                  "Resolve Object IDs to object names from the MIB and PIB"
+                                  " modules defined below."
+                                  " You must restart Wireshark for this change to take effect",
                                   &load_smi_modules);
 
     prefs_register_bool_preference(nameres, "suppress_smi_errors",
                                   "Suppress SMI errors",
-                                  "Some errors can be ignored. If unsure, set to false.",
+                                  "While loading MIB or PIB modules errors may be detected,"
+                                  " which are reported. Some errors can be ignored."
+                                  " If unsure, set to false.",
                                   &suppress_smi_errors);
 
     smi_paths_uat = uat_new("SMI Paths",
@@ -793,8 +797,8 @@ void oid_pref_init(module_t *nameres)
     prefs_register_uat_preference(nameres,
                                   "smi_paths",
                                   "SMI (MIB and PIB) paths",
-                                  "Search paths for SMI (MIB and PIB) modules. You must\n"
-                                  "restart Wireshark for these changes to take effect.",
+                                  "Search paths for SMI (MIB and PIB) modules. You must"
+                                  " restart Wireshark for these changes to take effect.",
                                   smi_paths_uat);
 
     smi_modules_uat = uat_new("SMI Modules",
@@ -821,8 +825,8 @@ void oid_pref_init(module_t *nameres)
     prefs_register_uat_preference(nameres,
                                   "smi_modules",
                                   "SMI (MIB and PIB) modules",
-                                  "List of enabled SMI (MIB and PIB) modules. You must\n"
-                                  "restart Wireshark for these changes to take effect.",
+                                  "List of SMI (MIB and PIB) modules to load. You must"
+                                  " restart Wireshark for these changes to take effect.",
                                   smi_modules_uat);
 
 #else