diff --git a/docbook/wsug_src/WSUG_chapter_io.adoc b/docbook/wsug_src/WSUG_chapter_io.adoc index 298fe300e9..815e7b6101 100644 --- a/docbook/wsug_src/WSUG_chapter_io.adoc +++ b/docbook/wsug_src/WSUG_chapter_io.adoc @@ -334,7 +334,7 @@ The following file formats can be saved by Wireshark (with the known file extens * EyeSDN USB S0 traces ({asterisk}.trc) -* Tekronix K12 text file format captures ({asterisk}.txt) +* Tektronix K12 text file format captures ({asterisk}.txt) * Tektronix K12xx 32bit .rf5 format captures ({asterisk}.rf5) @@ -670,7 +670,7 @@ Once all input and import parameters are setup click btn:[Import] to start the import. If your current data wasn’t saved before you will be asked to save it first. -If the import button doesn't unlock, make sure all encapsualation parameters are +If the import button doesn't unlock, make sure all encapsulation parameters are in the expected range and all unlocked fields are populated when using regex mode (the placeholder text is not used as default). diff --git a/docbook/wsug_src/WSUG_chapter_work.adoc b/docbook/wsug_src/WSUG_chapter_work.adoc index 57c8f63cf9..46a0362b91 100644 --- a/docbook/wsug_src/WSUG_chapter_work.adoc +++ b/docbook/wsug_src/WSUG_chapter_work.adoc @@ -636,7 +636,7 @@ as the pattern. In this case both expressions give the same result because Wires both support the same byte escape sequence (0x43 is the ASCII hex code for `C`). An example where this fails badly is `+foo matches "bar\x28"+`. Because 0x28 is the ASCII -code for `(` the pattern input to PCRE is `+"bar("+`. This regular expression is synctatically +code for `(` the pattern input to PCRE is `+"bar("+`. This regular expression is syntactically invalid (missing closing parenthesis). To match a literal parenthesis in a display filter regular expression it must be escaped (twice) with backslashes. diff --git a/epan/dissectors/packet-bblog.c b/epan/dissectors/packet-bblog.c index 267a2a738f..fa5d956a91 100644 --- a/epan/dissectors/packet-bblog.c +++ b/epan/dissectors/packet-bblog.c @@ -159,8 +159,8 @@ static const value_string event_identifier_values[] = { { BBR_LOG_MSGSIZE, "We received a EMSGSIZE error" }, { BBR_LOG_BBRRTT, "BBR RTT is updated" }, { BBR_LOG_JUSTRET, "We just returned out of output" }, - { BBR_LOG_STATE, "A BBR state change occured" }, - { BBR_LOG_PKT_EPOCH, "A BBR packet epoch occured" }, + { BBR_LOG_STATE, "A BBR state change occurred" }, + { BBR_LOG_PKT_EPOCH, "A BBR packet epoch occurred" }, { BBR_LOG_PERSIST, "BBR changed to/from a persists" }, { TCP_LOG_FLOWEND, "End of a flow" }, { BBR_LOG_RTO, "BBR's timeout includes BBR info" }, @@ -171,7 +171,7 @@ static const value_string event_identifier_values[] = { { TCP_LOG_USERSEND, "User level sends data" }, { BBR_RSM_CLEARED, "RSM cleared of ACK flags" }, { BBR_LOG_STATE_TARGET, "Log of target at state" }, - { BBR_LOG_TIME_EPOCH, "A timed based Epoch occured" }, + { BBR_LOG_TIME_EPOCH, "A timed based Epoch occurred" }, { BBR_LOG_TO_PROCESS, "A to was processed" }, { BBR_LOG_BBRTSO, "TSO update" }, { BBR_LOG_HPTSDIAG, "Hpts diag insert" }, diff --git a/epan/dissectors/packet-isobus-vt.c b/epan/dissectors/packet-isobus-vt.c index be31844d75..d59299cfb9 100644 --- a/epan/dissectors/packet-isobus-vt.c +++ b/epan/dissectors/packet-isobus-vt.c @@ -5444,12 +5444,12 @@ proto_register_isobus_vt(void) NULL, HFILL } }, { &hf_isobus_vt_graphicscontext_copycanvastopicturegraphic_objectidpicturegraphic, - { "Object ID of Picture Grahpic", "isobus.vt.graphics_context.copy_canvas_to_picture_graphic.object_id_picture_graphic", + { "Object ID of Picture Graphic", "isobus.vt.graphics_context.copy_canvas_to_picture_graphic.object_id_picture_graphic", FT_UINT16, BASE_DEC_HEX, VALS(object_id_strings), 0x0, NULL, HFILL } }, { &hf_isobus_vt_graphicscontext_copyviewporttopicturegraphic_objectidpicturegraphic, - { "Object ID of Picture Grahpic", "isobus.vt.graphics_context.copy_viewport_to_picture_graphic.object_id_picture_graphic", + { "Object ID of Picture Graphic", "isobus.vt.graphics_context.copy_viewport_to_picture_graphic.object_id_picture_graphic", FT_UINT16, BASE_DEC_HEX, VALS(object_id_strings), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 1687fd4c23..60e208d0a7 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -8554,7 +8554,7 @@ static void dissect_parametrized_serialized_data(proto_tree *tree, tvbuff_t *tvb /* * Serialized data dissector * */ /* *********************************************************************** */ /* Note: the encapsulation header is ALWAYS big endian, then the encapsulation - * type specified the type of endianess of the payload. + * type specified the type of endianness of the payload. */ static void dissect_serialized_data(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset, int size, const char *label, guint16 vendor_id, gboolean is_discovery_data, @@ -14740,7 +14740,7 @@ void proto_register_rtps(void) { FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_rtps_flag_udpv4_wan_binding_ping_e, { - "Endianess", "rtps.flag.udpv4_wan_binding_ping.e", + "Endianness", "rtps.flag.udpv4_wan_binding_ping.e", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01, NULL, HFILL } }, { &hf_rtps_flag_udpv4_wan_binding_ping_l, { diff --git a/plugins/epan/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c index 8205f20264..b720e09619 100644 --- a/plugins/epan/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/epan/wimaxasncp/packet-wimaxasncp.c @@ -388,9 +388,9 @@ static const ver_value_string wimaxasncp_ms_state_msg_vals[] = {WIMAXASNCP_NWGVER_R10_V120, { 7, "Key_Change_Directive"}}, {WIMAXASNCP_NWGVER_R10_V120, { 8, "Key_Change_Cnf"}}, {WIMAXASNCP_NWGVER_R10_V120, { 9, "Key_Change_Ack"}}, - {WIMAXASNCP_NWGVER_R10_V120, { 10, "Relocation_Conplete_Req"}}, - {WIMAXASNCP_NWGVER_R10_V120, { 11, "Relocation_Conplete_Rsp"}}, - {WIMAXASNCP_NWGVER_R10_V120, { 12, "Relocation_Conplete_Ack"}}, + {WIMAXASNCP_NWGVER_R10_V120, { 10, "Relocation_Complete_Req"}}, + {WIMAXASNCP_NWGVER_R10_V120, { 11, "Relocation_Complete_Rsp"}}, + {WIMAXASNCP_NWGVER_R10_V120, { 12, "Relocation_Complete_Ack"}}, {WIMAXASNCP_NWGVER_R10_V120, { 13, "Relocation_Notify"}}, {WIMAXASNCP_NWGVER_R10_V120, { 14, "Relocation_Req"}}, {WIMAXASNCP_NWGVER_R10_V120, { 15, "Relocation_Rsp"}}, diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 465ab42c9d..39e93791de 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -4,6 +4,7 @@ 100mb 10base 10gig +16apsk 16bit 1xrtt 32bit @@ -23,10 +24,12 @@ activations actuator additionsr adjacency +adlink administrable adwin aes128 aes256 +aggregations aggregator agnss aifsn @@ -140,6 +143,8 @@ canceled canceling cancelled canceller +canfd +canfdmessage cannot canonicalised canonicalize @@ -180,6 +185,7 @@ ciphering ciphersuite ciphertext citrix +cksum classmark classmark3 clientkey @@ -367,6 +373,7 @@ encrypting endace endian endianness +enodeb enrollee entityid entryid @@ -524,6 +531,7 @@ initializing inline inode inodes +instrumented interferer interleaving interruptible @@ -578,6 +586,7 @@ linkinfo linksys linux list1 +literals lithionics logcat loghans @@ -640,6 +649,7 @@ mrcpv msbuild msgid msgsend +msisdn mtftp mtrace multiband @@ -674,6 +684,7 @@ netboot netfilter netflow nethop +netkey netkeyindex netlink netlogon @@ -787,6 +798,7 @@ portmod portnumber portstatus posix +postfix powercontrol pppdump prach @@ -802,6 +814,7 @@ prepay prepend preshared printf +prioritization prioritized privkey procid @@ -832,6 +845,7 @@ qosinfo qsearch quadrature quadro +quantifiers quiescing quintuplet quintuplets @@ -917,6 +931,7 @@ reregister reroute rerouted rerouting +resampled rescan resegment resend @@ -972,6 +987,7 @@ sectorized segno semiautomatic sendto +separators seqno seqnum sequenceno @@ -999,6 +1015,7 @@ smpte sname snaplen snow3g +softkey someip someipsd spare @@ -1015,6 +1032,7 @@ spcell specifiers spectrograph speex +spline spnego spoofing spooled @@ -1075,6 +1093,7 @@ subtrees superset switchinfo synchronizing +synchronously synphasor syntaxes sysdig @@ -1094,6 +1113,7 @@ tdd768 technica Tektronix Telecomunicaciones +telefonica Telefónica Teléfonos telekom @@ -1182,6 +1202,7 @@ undelete undeliverable underflow underrun +undisposed undissected unencrypted unescaped @@ -1195,6 +1216,7 @@ unicode unicom unignore unimplemented +uninformative uninitialized uninstall uninstallation @@ -1209,8 +1231,11 @@ unlink unlinked unmap unmappable +unmark unmarshal unmerged +unmute +unmuted unoptimized unordered unparsable @@ -1240,6 +1265,7 @@ untruncated untrusted untunneled untyped +unvisited updatability updatable uplink @@ -1274,6 +1300,7 @@ version6 version7 versioned versioning +viavi virtualization vlans vocoder @@ -1282,6 +1309,7 @@ volerr wakeup webcam websocket +whoami wideband wikipedia wikis