diff options
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/release-notes.asciidoc | 3 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_libraries.asciidoc | 2 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_advanced.asciidoc | 4 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_statistics.asciidoc | 2 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_use.asciidoc | 2 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_work.asciidoc | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 78aaba7b4e..f0c0de88f7 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -49,6 +49,9 @@ since version 2.6.0: * The BOOTP dissector has been renamed to DHCP. With the exception of “bootp.dhcp”, the old “bootp.*” display filter fields are still supported but may be removed in a future release. +* The SSL dissector has been renamed to TLS. As with BOOTP the old + “ssl.*” display filter fields are supported but may be removed in a + future release. === Removed Features and Support diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc index db4c328166..c81db8b491 100644 --- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc @@ -229,7 +229,7 @@ https://www.winpcap.org/install/[] === GnuTLS (optional) -The GNU Transport Layer Security Library is used to dissect SSL and TLS +The GNU Transport Layer Security Library is used to dissect TLS and SSL protocols (aka: HTTPS). [[ChLibsUnixGNUTLS]] diff --git a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc b/docbook/wsug_src/WSUG_chapter_advanced.asciidoc index b823d1324d..ed2a570c41 100644 --- a/docbook/wsug_src/WSUG_chapter_advanced.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_advanced.asciidoc @@ -18,10 +18,10 @@ This chapter will describe some of Wireshark’s advanced features. It can be very helpful to see protocol in the way that the application layer sees it. Perhaps you are looking for passwords in a Telnet stream, or you are trying to make sense of a data stream. Maybe you just need a -display filter to show only the packets in an SSL stream. If so, +display filter to show only the packets in a TLS or SSL stream. If so, Wireshark’s ability to follow protocol streams will be useful to you. -Simply select a TCP, UDP, SSL, or HTTP packet in the packet list of the stream/connection you are +Simply select a TCP, UDP, TLS, or HTTP packet in the packet list of the stream/connection you are interested in and then select the Follow TCP Stream menu item from the Wireshark Tools menu (or use the context menu in the packet list). Wireshark will set an appropriate display filter and pop up a dialog box with all the data from the diff --git a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc index 66d7c0ec0a..3a66fe51aa 100644 --- a/docbook/wsug_src/WSUG_chapter_statistics.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_statistics.asciidoc @@ -129,7 +129,7 @@ be counted for each packet. Example: In the screenshot IP has 99.9% and TCP Protocol layers can consist of packets that won’t contain any higher layer protocol, so the sum of all higher layer packets may not sum up to the protocols packet count. Example: In the screenshot TCP has 98.5% but the sum of the -subprotocols (SSL, HTTP, etc) is much less. This can be caused by continuation +subprotocols (TLS, HTTP, etc) is much less. This can be caused by continuation frames, TCP protocol overhead, and other undissected data. A single packet can contain the same protocol more than once. In this case, the diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.asciidoc index 9f935f1600..a98c7556b2 100644 --- a/docbook/wsug_src/WSUG_chapter_use.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_use.asciidoc @@ -541,7 +541,7 @@ image::wsug_graphics/ws-analyze-menu.png[{screenshot-attrs}] |menu:User Specified Decodes...[] ||This menu item allows the user to force Wireshark to decode certain packets as a particular protocol, see <<ChAdvDecodeAsShow>> |menu:Follow[TCP Stream] ||This menu item brings up a separate window and displays all the TCP segments captured that are on the same TCP connection as a selected packet, see <<ChAdvFollowStreamSection>> |menu:Follow[UDP Stream] ||Same functionality as “Follow TCP Stream” but for UDP streams. -|menu:Follow[SSL Stream] ||Same functionality as “Follow TCP Stream” but for SSL streams. See the wiki page on link:{wireshark-wiki-url}SSL[SSL] for instructions on providing SSL keys. +|menu:Follow[TLS Stream] ||Same functionality as “Follow TCP Stream” but for TLS or SSL streams. See the wiki page on link:{wireshark-wiki-url}SSL[SSL] for instructions on providing TLS keys. |menu:Follow[HTTP Stream] ||Same functionality as “Follow TCP Stream” but for HTTP streams. |menu:Expert Info[] ||Open a dialog showing some expert information about the captured packets. The amount of information will depend on the protocol and varies from very detailed to non-existent. XXX - add a new section about this and link from here |menu:Conversation Filter[...] ||In this menu you will find conversation filter for various protocols. diff --git a/docbook/wsug_src/WSUG_chapter_work.asciidoc b/docbook/wsug_src/WSUG_chapter_work.asciidoc index 0a61b8ce30..8b8aa2d42e 100644 --- a/docbook/wsug_src/WSUG_chapter_work.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_work.asciidoc @@ -113,7 +113,7 @@ The following table gives an overview of which functions are available in this |menu:SCTP[]|| Allows you to analyze and prepare a filter for this SCTP association. |menu:Follow TCP Stream[]|menu:Analyze[]| Allows you to view all the data on a TCP stream between a pair of nodes. |menu:Follow UDP Stream[]|menu:Analyze[]| Allows you to view all the data on a UDP datagram stream between a pair of nodes. -|menu:Follow SSL Stream[]|menu:Analyze[]| Same as “Follow TCP Stream” but for SSL. XXX - add a new section describing this better. +|menu:Follow TLS Stream[]|menu:Analyze[]| Same as “Follow TCP Stream” but for TLS or SSL. XXX - add a new section describing this better. |menu:Copy/ Summary (Text)[]|| Copy the summary fields as displayed to the clipboard, as tab-separated text. |menu:Copy/ Summary (CSV)[]|| Copy the summary fields as displayed to the clipboard, as comma-separated text. |menu:Copy/ As Filter[]|| Prepare a display filter based on the currently selected item and copy that filter to the clipboard. @@ -157,7 +157,7 @@ description of each item. |menu:Colorize with Filter[]|| This menu item uses a display filter with the information from the selected protocol item to build a new colorizing rule. |menu:Follow TCP Stream[]|menu:Analyze[]| Allows you to view all the data on a TCP stream between a pair of nodes. |menu:Follow UDP Stream[]|menu:Analyze[]| Allows you to view all the data on a UDP datagram stream between a pair of nodes. -|menu:Follow SSL Stream[]|menu:Analyze[]| Same as “Follow TCP Stream” but for SSL. XXX - add a new section describing this better. +|menu:Follow TLS Stream[]|menu:Analyze[]| Same as “Follow TCP Stream” but for TLS. XXX - add a new section describing this better. |menu:Copy/ Description[]|menu:Edit[]| Copy the displayed text of the selected field to the system clipboard. |menu:Copy/ Fieldname[]|menu:Edit[]| Copy the name of the selected field to the system clipboard. |menu:Copy/ Value[]|menu:Edit[]| Copy the value of the selected field to the system clipboard. |