WSUG: Update the Service Response Time section.

Update the Service Response Time section of the User's Guide. The sample
captures page had a nice SMB2 capture file, so use that for the example.

Use title case for "Diameter" to match the RFCs.

Change-Id: Icff510dbe2d77db9cd42548ad58439d17282e851
Reviewed-on: https://code.wireshark.org/review/36421
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 37 insertions, 42 deletions

diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt
index 7aa9daf726..2e83e21d89 100644
--- a/docbook/CMakeLists.txt
+++ b/docbook/CMakeLists.txt
@@ -191,10 +191,9 @@ set(WSUG_GRAPHICS
 	wsug_graphics/ws-stats-conversations.png
 	wsug_graphics/ws-stats-endpoints.png
 	wsug_graphics/ws-stats-hierarchy.png
-	wsug_graphics/ws-stats-iographs.png # GTK+
+	wsug_graphics/ws-stats-iographs.png
 	wsug_graphics/ws-stats-packet-lengths.png
-	wsug_graphics/ws-stats-srt-dcerpc-filter.png # GTK+
-	wsug_graphics/ws-stats-srt-dcerpc.png # GTK+
+	wsug_graphics/ws-stats-srt-smb2.png
 	wsug_graphics/ws-stats-lte-mac-traffic.png
 	wsug_graphics/ws-stats-lte-rlc-traffic.png
 	wsug_graphics/ws-stats-wlan-traffic.png # GTK+
diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png
deleted file mode 100644
index aa129690fb..0000000000
--- a/docbook/wsug_graphics/ws-stats-srt-dcerpc-filter.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/ws-stats-srt-dcerpc.png b/docbook/wsug_graphics/ws-stats-srt-dcerpc.png
deleted file mode 100644
index 1f7b7d0405..0000000000
--- a/docbook/wsug_graphics/ws-stats-srt-dcerpc.png
+++ /dev/null
diff --git a/docbook/wsug_graphics/ws-stats-srt-smb2.png b/docbook/wsug_graphics/ws-stats-srt-smb2.png
new file mode 100644
index 0000000000..f191ce05b9
--- /dev/null
+++ b/docbook/wsug_graphics/ws-stats-srt-smb2.png
diff --git a/docbook/wsug_src/WSUG_chapter_statistics.adoc b/docbook/wsug_src/WSUG_chapter_statistics.adoc
index 0295f5cd15..7b061bb74a 100644
--- a/docbook/wsug_src/WSUG_chapter_statistics.adoc
+++ b/docbook/wsug_src/WSUG_chapter_statistics.adoc
@@ -481,6 +481,7 @@ You can see a list of useful keyboard shortcuts by right-clicking on the graph.
 
 [[ChStatIOGraphsMissingValues]]
 
+[discrete]
 ==== Missing Values Are Zero
 
 Wireshark's I/O Graph window doesn’t distinguish between missing and zero values.
@@ -499,55 +500,50 @@ Zero values are shown in line graphs, and bar charts.
 
 === Service Response Time
 
-The service response time is the time between a request and the corresponding
-response. This information is available for many protocols.
+The service response time is the time between a request and the corresponding response.
+This information is available for many protocols, including the following:
 
-Service response time statistics are currently available for the following protocols:
+* AFP
+* CAMEL
+* DCE-RPC
+* Diameter
+* Fibre Channel
+* GTP
+* H.225 RAS
+* LDAP
+* MEGACO
+* MGCP
+* NCP
+* ONC-RPC
+* RADIUS
+* SCSI
+* SMB
+* SMB2
+* SNMP
 
-* _DCE-RPC_
+As an example, the SMB2 service response time is described below in more detail.
+The other Service Response Time windows will show statistics specific to their respective protocols, but will offer the same menu options.
 
-* _Fibre Channel_
+[[ChStatSRTSMB2]]
 
-* _H.225 RAS_
+==== The “SMB2 Service Response Time Statistics” Window
 
-* _LDAP_
+This window shows the number of transactions for each SMB2 opcode present in the capture file along with various response time statistics.
+Right-clicking on a row will let you apply or prepare filters for, search for, or colorize a specific opcode.
+You can also copy all of the response time information or save it in a variety of formats.
 
-* _LTE MAC_
+.The “SMB2 Service Response Time Statistics” window
+image::wsug_graphics/ws-stats-srt-smb2.png[{screenshot-attrs}]
 
-* _MGCP_
+You can optionally apply a display filter in order to limit the statistics to a specific set of packets.
 
-* _ONC-RPC_
-
-* _SMB_
-
-As an example, the DCE-RPC service response time is described in more detail.
-
-[NOTE]
-====
-The other Service Response Time windows will work the same way (or only slightly
-different) compared to the following description.
-====
-
-[[ChStatSRTDceRpc]]
-
-==== The “Service Response Time DCE-RPC” Window
-
-The service response time of DCE-RPC is the time between the request and the
-corresponding response.
-
-First, you have to select the DCE-RPC interface:
-
-.The “Compute DCE-RPC statistics” window
-image::wsug_graphics/ws-stats-srt-dcerpc-filter.png[{screenshot-attrs}]
+The main dialog buttons along the bottom let you do the following:
 
-You can optionally set a display filter to reduce the number of packets.
+The btn:[Copy] button will copy the response time information as text.
 
-.The “DCE-RPC Statistic for ...” window
-image::wsug_graphics/ws-stats-srt-dcerpc.png[{screenshot-attrs}]
+btn:[Save As...] will save the response time information in various formats.
 
-Each row corresponds to a method of the interface selected (so the EPM interface
-in version 3 has 7 methods). For each method the number of calls, and the
-statistics of the SRT time is calculated.
+btn:[Close] will close this dialog.
 
 [[ChStatDHCPBOOTP]]
 
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index e3bc4d4bc4..b34f1e98df 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -2540,7 +2540,7 @@ proto_register_diameter(void)
 {
 	module_t *diameter_module;
 
-	proto_diameter = proto_register_protocol ("Diameter Protocol", "DIAMETER", "diameter");
+	proto_diameter = proto_register_protocol ("Diameter Protocol", "Diameter", "diameter");
 
 	/* Allow dissector to find be found by name. */
 	diameter_sctp_handle = register_dissector("diameter", dissect_diameter, proto_diameter);