diff options
| -rw-r--r-- | doc/README.plugins | 2 | ||||
| -rw-r--r-- | doc/wireshark.pod | 4 | ||||
| -rw-r--r-- | docbook/faq.adoc | 4 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_io.adoc | 12 | ||||
| -rw-r--r-- | tools/wireshark_words.txt | 21 |
5 files changed, 32 insertions, 11 deletions
diff --git a/doc/README.plugins b/doc/README.plugins index 50cac8a366..dbd16d319c 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -199,7 +199,7 @@ See doc/plugins.example for an example. The plugin registration has changed with the extension of the build scripts. These now generate the additional code needed for plugin encapsulation in plugin.c. When using the new style build scripts, -stips the parts outlined below: +strips the parts outlined below: o Remove the following include statements: diff --git a/doc/wireshark.pod b/doc/wireshark.pod index f9b91b19b3..2f7ed252bd 100644 --- a/doc/wireshark.pod +++ b/doc/wireshark.pod @@ -129,10 +129,10 @@ Symbian OS btsnoop files TamoSoft CommView files =item * -Textronix K12xx 32bit .rf5 format files +Tektronix K12xx 32bit .rf5 format files =item * -Textronix K12 text file format captures +Tektronix K12 text file format captures =item * Apple PacketLogger files diff --git a/docbook/faq.adoc b/docbook/faq.adoc index 218096c155..7922f4f094 100644 --- a/docbook/faq.adoc +++ b/docbook/faq.adoc @@ -231,8 +231,8 @@ captures * Juniper Netscreen snoop files * Symbian OS btsnoop files * TamoSoft CommView files -* Textronix K12xx 32bit .rf5 format files -* Textronix K12 text file format captures +* Tektronix K12xx 32bit .rf5 format files +* Tektronix K12 text file format captures * Apple PacketLogger files * Files from Aethra Telecommunications' PC108 software for their test instruments diff --git a/docbook/wsug_src/WSUG_chapter_io.adoc b/docbook/wsug_src/WSUG_chapter_io.adoc index 40d70c9426..0b82ecb3e1 100644 --- a/docbook/wsug_src/WSUG_chapter_io.adoc +++ b/docbook/wsug_src/WSUG_chapter_io.adoc @@ -161,7 +161,7 @@ The following file formats from other capture tools can be opened by Wireshark: * Linux Bluez Bluetooth stack hcidump -w traces -* Catapult DCT2000 .out files +* Catapult (now Ixia/Keysight) DCT2000 .out files * Gammu generated text output from Nokia DCT3 phones in Netmonitor mode @@ -173,9 +173,9 @@ The following file formats from other capture tools can be opened by Wireshark: * Tamosoft CommView captures -* Textronix K12xx 32bit .rf5 format captures +* Tektronix K12xx 32bit .rf5 format captures -* Textronix K12 text file format captures +* Tektronix K12 text file format captures * Apple PacketLogger captures @@ -328,7 +328,7 @@ The following file formats can be saved by Wireshark (with the known file extens * Tamosoft CommView captures ({asterisk}.ncf) -* Catapult DCT2000 .out files ({asterisk}.out) +* Catapult (now Ixia/Keysight) DCT2000 .out files ({asterisk}.out) * Endace Measurement Systems’ ERF format capture({asterisk}.erf) @@ -607,7 +607,7 @@ image::wsug_graphics/ws-file-import-regex.png[{medium-screenshot-attrs}] Packet format regular expression:: This is the regex used for searching packets and metadata inside the input file. -Named capuring subgroups are used to find the individual fields. Anchors `^` and +Named capturing subgroups are used to find the individual fields. Anchors `^` and `$` are set to match directly before and after newlines `\n` or `\r\n`. See https://developer.gnome.org/glib/stable/glib-regex-syntax.html[GRegex] for a full documentation. @@ -633,7 +633,7 @@ are only available when the regex contains a `(?<dir>...)` group. Timestamp Format:: This is the format specifier used to parse the timestamps in the text file to import. It uses the same format as `strptime(3)` with the addition of `%f` for -zero padded fractions of seconds. The percision of `%f` is determined from it's +zero padded fractions of seconds. The precision of `%f` is determined from it's length. The most common fields are `%H`, `%M` and `%S` for hours, minutes and seconds. The straightforward HH:MM:SS format is covered by %T. For a full definition of the syntax look for `strptime(3)`, diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 4ea34fa629..64ff7611a1 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -200,6 +200,7 @@ colorizing combiner combiners communication +compilers computable concatenate concatenated @@ -221,6 +222,7 @@ couchbase coverity cpdlc cpich +cppcheck cpuregisters credential credentials @@ -253,6 +255,7 @@ deauthentication deauthentications debian debug +decapsulation dechunk decompressing decompressor @@ -274,6 +277,7 @@ dehumidification deinterleaved delimited delimiters +delimiting demodulator demultiplexer demultiplexers @@ -373,15 +377,19 @@ errorportinfo erspan España etheraddr +ethers ethertype ettarr +etwdump etype eutra eutran eventlog +executables extattr extcap extensibility +extensible exthdr extrainformation failover @@ -436,6 +444,7 @@ gnutls goaway google gprscdr +greyed groupa groupb groupcast @@ -447,6 +456,7 @@ hangup harqid hartip hashed +hashes hazelcast heuristic hfarr @@ -461,6 +471,8 @@ hsdpa hsdsch hspdsch hsupa +htonl +htons http2 https huffman @@ -476,6 +488,7 @@ ifconfig ikev2 illuminance immersive +implementations implementer implementor inband @@ -724,6 +737,7 @@ params parlay parms parser +parses passcode passkey passthrough @@ -757,6 +771,7 @@ portnumber portstatus posix powercontrol +pppdump prach preconfiguration preconfigured @@ -774,6 +789,7 @@ privkey procid profidrive profinet +promiscuously protected protoabbrev protobuf @@ -855,6 +871,7 @@ reestablishment referer referrer regex +regexp reimplemented reinitialization reinitialize @@ -973,6 +990,7 @@ spare7 spare8 spare9 spcell +specifiers spectrograph speex spnego @@ -981,6 +999,7 @@ spooled srbid srcport srvcc +sshdump sshkey ssupervisor stanag @@ -1050,6 +1069,7 @@ tdd128 tdd384 tdd768 technica +Tektronix Telecomunicaciones Telefónica Teléfonos @@ -1101,6 +1121,7 @@ uavcan uboot ubuntu udpcp +udpdump uint16 uint32 uint8 |