diff --git a/doc/tshark.pod b/doc/tshark.pod index 74fcbb8ae2..d37efab81d 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -2084,7 +2084,7 @@ active. =item WIRESHARK_LOG_FATAL -Sets the fatal log level. Fatal log levels cause the progeam to abort. +Sets the fatal log level. Fatal log levels cause the program to abort. The fatal log level be set to C or C. C is always fatal. diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 0c6f14eee6..bb267fec9f 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -2873,7 +2873,7 @@ proto_register_bthfp(void) NULL, HFILL} }, { &hf_ccwa_show_result_code, - { "Show Result Code Presentation Status", "bthfp.ccwa.presentaion_status", + { "Show Result Code Presentation Status", "bthfp.ccwa.presentation_status", FT_UINT32, BASE_DEC, VALS(ccwa_show_result_code_vals), 0, NULL, HFILL} }, diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index dcbf50eaf4..a8061b1dbc 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -7307,7 +7307,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_bitmask, { "Aspect Ratio Bitmask", - "rtcp.psfb.ms.vsr.entry.apsect_ratio", + "rtcp.psfb.ms.vsr.entry.aspect_ratio", FT_UINT8, BASE_HEX, NULL, @@ -7319,7 +7319,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_4by3, { "Aspect Ratio 4 by 3", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_4by3", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_4by3", FT_BOOLEAN, 8, NULL, @@ -7331,7 +7331,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_16by9, { "Aspect Ratio 16 by 9", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_16by9", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_16by9", FT_BOOLEAN, 8, NULL, @@ -7343,7 +7343,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_1by1, { "Aspect Ratio 1 by 1", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_1by1", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_1by1", FT_BOOLEAN, 8, NULL, @@ -7355,7 +7355,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_3by4, { "Aspect Ratio 3 by 4", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_3by4", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_3by4", FT_BOOLEAN, 8, NULL, @@ -7367,7 +7367,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_9by16, { "Aspect Ratio 9 by 16", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_9by16", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_9by16", FT_BOOLEAN, 8, NULL, @@ -7379,7 +7379,7 @@ proto_register_rtcp(void) &hf_rtcp_psfb_ms_vsre_aspect_ratio_20by3, { "Aspect Ratio 20 by 3", - "rtcp.psfb.ms.vsr.entry.apsect_ratio_20by3", + "rtcp.psfb.ms.vsr.entry.aspect_ratio_20by3", FT_BOOLEAN, 8, NULL, diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index fe5bac7cba..8d01e6156d 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -223,7 +223,7 @@ static const value_string response_codes_vs[] = { { 450, "Requested mail action not taken: mailbox unavailable" }, { 451, "Requested action aborted: local error in processing" }, { 452, "Requested action not taken: insufficient system storage" }, - { 454, "Temporary authenticaion failed" }, + { 454, "Temporary authentication failed" }, { 500, "Syntax error, command unrecognized" }, { 501, "Syntax error in parameters or arguments" }, { 502, "Command not implemented" }, diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 39e93791de..4fb65a4a90 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -37,6 +37,7 @@ aironet airpcap airtel alcap +alcatel alljoyn alloc allocators @@ -243,7 +244,9 @@ cryptographic csapi ctype customizable +customization customizing +cyphering datagram datagrams dataitem @@ -291,6 +294,7 @@ demodulator demultiplexer demultiplexers deobfuscated +depassivated deprecated deprotection dequeue @@ -408,6 +412,7 @@ extensible exthdr extrainformation failover +fastip fastmsg fattr fiber @@ -497,6 +502,7 @@ ident idiographic idl2wrs iec60870 +ieee1609dot ieee17221 ieee80211 iface @@ -573,6 +579,8 @@ keyring keytab knxip l2cap +l2vpn +l3vpn lanalyzer lcgid lcids @@ -606,10 +614,13 @@ mantissa manuf mappable mariadb +marvell +mathieson maxlen maybefcs mbits mcast +mcptt mcsset measurability measurements @@ -736,6 +747,7 @@ ofpat ofppf ofpxmt om2000 +onboarding onduration onoff ontime @@ -766,6 +778,7 @@ parms parser parses passcode +passivated passkey passthrough passwd @@ -962,6 +975,7 @@ retry retrying retyping revalidate +revalidation revertive rfcomm rlcmac @@ -1008,6 +1022,7 @@ sharkd siapp sidelink signaling +signon simulcast skype slsch @@ -1038,6 +1053,7 @@ spoofing spooled srbid srcport +srtcp srvcc sshdump sshkey @@ -1078,12 +1094,14 @@ subnet subnets subobj subobject +subopt suboption suboptions subparam subpdu subpm subquery +subrects subselect subselection subslot @@ -1105,6 +1123,7 @@ tablemod tabular tclas tcpdump +tcpflags tcpip tcpudp tdd128 @@ -1154,6 +1173,7 @@ tunid tunneled tunneling tuple +tuples tvbuff twamp type1 @@ -1175,7 +1195,9 @@ unacked unadvise unaligned unallocated +unallowed unassign +unassoc unauthenticated unbind unbuffered @@ -1252,6 +1274,7 @@ unrecovered unregister unregistration unreportable +unresolvable unresponded unroutable unsecure @@ -1306,6 +1329,7 @@ vlans vocoder vodafone volerr +vxlan wakeup webcam websocket