diff --git a/doc/text2pcap.adoc b/doc/text2pcap.adoc index fc9082bf5a..f499cd56bd 100644 --- a/doc/text2pcap.adoc +++ b/doc/text2pcap.adoc @@ -288,7 +288,7 @@ the dissector to be called for the packet (PROTO_NAME tag). Use this option if your dump is the payload for a single upper layer protocol (so specifying a link layer type would not work) and you wish to create a capture file without a full dummy protocol stack. Automatically sets the link layer type to -Wirehshark Upper PDU export. Without this option, if the Upper PDU export +Wireshark Upper PDU export. Without this option, if the Upper PDU export link layer type (252) is selected the dissector defaults to "data". -- diff --git a/doc/tshark.adoc b/doc/tshark.adoc index 05ce4b95d5..8dfe4c63bb 100644 --- a/doc/tshark.adoc +++ b/doc/tshark.adoc @@ -1060,7 +1060,7 @@ displays undelimited ASCII dump text by default. *delimit*:: Enable hexdump with the ASCII dump text delimited with '|' characters. -This is useful to unambigiously determine the last of the hex byte text +This is useful to unambiguously determine the last of the hex byte text and start of the ASCII dump text. *noascii*:: diff --git a/epan/dissectors/packet-eti.c b/epan/dissectors/packet-eti.c index d341435584..85db724188 100644 --- a/epan/dissectors/packet-eti.c +++ b/epan/dissectors/packet-eti.c @@ -1273,7 +1273,7 @@ static const value_string appl_usage_orders_vals[] = { // ApplUsageOrders static const value_string basket_trade_report_type_vals[] = { // BasketTradeReportType { 0, "Submit" }, { 4, "Addendum" }, - { 5, "No_Was_Substitue" }, + { 5, "No_Was_Substitute" }, { 0xFF, "NO_VALUE" }, { 0, NULL } }; @@ -1578,7 +1578,7 @@ static const value_string multi_leg_reporting_type_vals[] = { // MultiLegReporti }; static const value_string multileg_model_vals[] = { // MultilegModel { 0, "Predefined_Multileg_Security" }, - { 1, "User_defined_Multleg" }, + { 1, "User_defined_Multileg" }, { 0xFF, "NO_VALUE" }, { 0, NULL } }; diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 0e34ca5f0c..097f67ebad 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -362,6 +362,7 @@ desegment desegmentation desegmenting deselect +destip destport deutschland devcap @@ -595,6 +596,7 @@ immersive implementations implementer implementor +inactivated inband incits incremented @@ -713,6 +715,7 @@ loopback lossy lscap lucent +luminaire luminance macaddr macaddress @@ -789,6 +792,7 @@ multiframe multiframes multihop multilateration +multileg multipacket multipart multipath @@ -942,6 +946,7 @@ picmg pinfo pixmap plaintext +plano plixer plugin pluginize