diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-09-13 08:40:27 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-09-13 22:37:52 +0000 |
| commit | cd95e197ca78feb1e83ec737b87ada0a1dd57d10 (patch) | |
| tree | 7d54d8cc9b6170acff8ca618b6d0eb5fa439f4f6 /doc/tshark.pod | |
| parent | 63743a3733441a4f54ca6216ad63654bb3012824 (diff) | |
Start renaming SSL to TLS.
Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS"
over "SSL" in user interface text and in the documentation.
Fix the test_tls_master_secret test while we're here.
Bug: 14922
Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8
Reviewed-on: https://code.wireshark.org/review/29649
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'doc/tshark.pod')
| -rw-r--r-- | doc/tshark.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tshark.pod b/doc/tshark.pod index b5222b8825..263332bf46 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -99,7 +99,7 @@ L<https://www.wireshark.org/docs/man-pages/wireshark.html> is a detailed description of the way B<Wireshark> handles this, which is the same way B<Tshark> handles this. -Compressed file support uses (and therefore requires) the zlib library. +Compressed file support uses (and therefore requires) the zlib library. If the zlib library is not present when compiling B<TShark>, it will be possible to compile it, but the resulting program will be unable to read compressed files. @@ -130,7 +130,7 @@ Read filters in B<TShark>, which allow you to select which packets are to be decoded or written to a file, are very powerful; more fields are filterable in B<TShark> than in other protocol analyzers, and the syntax you can use to create your filters is richer. As B<TShark> progresses, -expect more and more protocol fields to be allowed in read filters. +expect more and more protocol fields to be allowed in read filters. Read filters use the same syntax as display and color filters in B<Wireshark>; a read filter is specified with the B<-R> option. @@ -1214,7 +1214,7 @@ I<prot> specifies the transport protocol. It can be one of: tcp TCP udp UDP - ssl SSL + tls TLS or SSL I<mode> specifies the output mode. It can be one of: @@ -1227,7 +1227,7 @@ Since the output in B<ascii> or B<ebcdic> mode may contain newlines, the length of each section of output plus a newline precedes each section of output. I<filter> specifies the stream to be displayed. UDP/TCP streams are selected -with either the stream index or IP address plus port pairs. SSL streams are +with either the stream index or IP address plus port pairs. TLS streams are selected with the stream index. For example: ip-addr0:port0,ip-addr1:port1 |