summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-10-19 21:40:22 -0400
committerAnders Broman <a.broman58@gmail.com>2016-10-20 05:00:55 +0000
commitd38ed8e55f7df9b34b9a7859ff54dde726f2feb0 (patch)
treead0ec197c6391ee4cd4901ded81c9439b0641a66
parentf252831b43269dd06487cdf3e5e791ecc991bf3d (diff)
downloadwireshark-d38ed8e55f7df9b34b9a7859ff54dde726f2feb0.tar.gz
Put the SS7 PC name resolution feature in the release notes.
Fix the casing of the preference while at it (it now matches other name resolution preferences). Change-Id: Ibfecbc94f9eccefa7d3b1a50ae2598dfefb707a2 Reviewed-on: https://code.wireshark.org/review/18330 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--docbook/release-notes.asciidoc1
-rw-r--r--epan/addr_resolv.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 4492e04c2d..432aef98ac 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -33,6 +33,7 @@ since version 2.2.0:
installing the Windows Installer package and vice-versa.
* Source packages are now compressed using xz instead of bzip2.
* GTK+ is disabled by default in Autotools and CMake.
+* SS7 Point Codes can now be resolved into names with a hosts-like file.
//=== Removed Dissectors
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 00880b00b8..7cd6eb94c2 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2533,7 +2533,7 @@ addr_resolve_pref_init(module_t *nameres)
&gbl_resolv_flags.vlan_name);
prefs_register_bool_preference(nameres, "ss7_pc_name",
- "Resolve SS7 PC",
+ "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:"