Make the SMI preference a little more verbose. In the COPS and SNMP

preferences, tell the user where they can change the SMI settings. In
the 802.11 preferences, fix a tooltip.

svn path=/trunk/; revision=24620

6 files changed, 26 insertions, 8 deletions

diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 4df55eebd0..64f8411c6e 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1987,6 +1987,10 @@ void proto_register_snmp(void) {
 								assocs_uat);
 
 
+  prefs_register_static_text_preference(snmp_module, "info_mibs",
+      "MIB settings can be changed in the Name Resolution preferences",
+      "MIB settings can be changed in the Name Resolution preferences");
+
 	value_sub_dissectors_table = register_dissector_table("snmp.variable_oid","SNMP Variable OID", FT_STRING, BASE_NONE);
 
 	register_init_routine(renew_ue_cache);
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index b77ec02a03..ebcc823ce3 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -2422,6 +2422,10 @@ void proto_register_cops(void)
                                  "Decode the COPS messages using PacketCable clients. (Select port 2126)",
                                  &cops_packetcable);
 
+  prefs_register_static_text_preference(cops_module, "info_pibs",
+      "PIB settings can be changed in the Name Resolution preferences",
+      "PIB settings can be changed in the Name Resolution preferences");
+
   prefs_register_obsolete_preference(cops_module, "typefrommib");
 }
 
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 83b11beeb5..559021f917 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -10972,12 +10972,12 @@ proto_register_ieee80211 (void)
       "wpa-pwd:MyPassword[:MyAP] (WPA + plaintext password [+ SSID]),\n"
       "wpa-psk:0102030405...6061626364 (WPA + 256-bit key).  "
       "Invalid keys will be ignored.",
-      "This is just a static text");
+      "Valid key formats");
 #else
   prefs_register_static_text_preference(wlan_module, "info_decryption_key",
       "Key examples: 01:02:03:04:05 (40/64-bit WEP),\n"
       "010203040506070809101111213 (104/128-bit WEP)",
-      "This is just a static text");
+      "Valid key formats");
 #endif
 
   for (i = 0; i < MAX_ENCRYPTION_KEYS; i++) {
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index a7d00f7d4e..09634b10fb 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-snmp.c                                                              */
-/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */
+/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
 
 /* Input file: packet-snmp-template.c */
 
@@ -3469,6 +3469,10 @@ void proto_register_snmp(void) {
 								assocs_uat);
 
 
+  prefs_register_static_text_preference(snmp_module, "info_mibs",
+      "MIB settings can be changed in the Name Resolution preferences",
+      "MIB settings can be changed in the Name Resolution preferences");
+
 	value_sub_dissectors_table = register_dissector_table("snmp.variable_oid","SNMP Variable OID", FT_STRING, BASE_NONE);
 
 	register_init_routine(renew_ue_cache);
diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h
index d246561083..3aa0d29323 100644
--- a/epan/dissectors/packet-snmp.h
+++ b/epan/dissectors/packet-snmp.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-snmp.h                                                              */
-/* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . snmp.asn */
+/* ../../tools/asn2wrs.py -b -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn */
 
 /* Input file: packet-snmp-template.h */
 
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index d5f5e3e4a7..d122391df7 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -135,7 +135,7 @@ nameres_prefs_show(void)
 	/* Max concurrent requests */
 	table_row++;
 	g_snprintf(concur_str, 10+1, "%d", prefs.name_resolve_concurrency);
-	resolv_concurrency_te = create_preference_entry(main_tb, table_row, 
+	resolv_concurrency_te = create_preference_entry(main_tb, table_row,
 	    "Maximum concurrent requests:", "maximum parallel running DNS requests", concur_str);
 	OBJECT_SET_DATA(main_vb, RESOLVE_CONCURRENCY_KEY, resolv_concurrency_te);
 
@@ -146,7 +146,10 @@ nameres_prefs_show(void)
 	if (smi_paths_uat) {
 		table_row++;
 		sp_resolv_cb = create_preference_uat(main_tb, table_row,
-		    "SMI paths", "SMI paths to MIBS", smi_paths_uat);
+		    "SMI (MIB and PIB) paths",
+                    "Search paths for SMI (MIB and PIB) modules. You must\n"
+                    "restart Wireshark for these changes to take effect.",
+                    smi_paths_uat);
 		OBJECT_SET_DATA(main_vb, SP_RESOLVE_KEY, sp_resolv_cb);
 	}
 
@@ -155,7 +158,10 @@ nameres_prefs_show(void)
 	if (smi_modules_uat) {
 		table_row++;
 		sm_resolv_cb = create_preference_uat(main_tb, table_row,
-		    "SMI modules", "SMI list of modules", smi_modules_uat);
+		    "SMI (MIB and PIB) modules",
+                    "List of enabled SMI (MIB and PIB) modules. You must\n"
+                    "restart Wireshark for these changes to take effect.",
+                    smi_modules_uat);
 		OBJECT_SET_DATA(main_vb, SM_RESOLVE_KEY, sm_resolv_cb);
 	}
 #endif
@@ -182,7 +188,7 @@ nameres_prefs_fetch(GtkWidget *w)
 	t_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, T_RESOLVE_KEY);
 #ifdef HAVE_GNU_ADNS
 	c_resolv_cb = (GtkWidget *)OBJECT_GET_DATA(w, C_RESOLVE_KEY);
-	
+
 	resolv_concurrency_te = (GtkWidget *)OBJECT_GET_DATA(w, RESOLVE_CONCURRENCY_KEY);
 #endif /* HAVE_GNU_ADNS */
 #ifdef HAVE_LIBSMI