1 Patch origin: in-house |
1 Patch origin: in-house |
2 Patch status: Solaris-specific; not suitable for upstream |
2 Patch status: Solaris-specific; not suitable for upstream |
3 |
3 |
4 Solaris specific documentation changes. |
4 Solaris specific documentation changes. |
5 |
5 |
6 --- doc/tshark.pod.~1~ 2016-04-22 10:12:55.000000000 -0700 |
6 --- doc/tshark.pod.~1~ 2016-02-26 11:58:04.000000000 -0800 |
7 +++ doc/tshark.pod 2016-06-17 10:29:10.712527957 -0700 |
7 +++ doc/tshark.pod 2016-04-22 10:04:13.418143254 -0700 |
8 @@ -488,9 +488,11 @@ |
8 @@ -497,9 +497,11 @@ |
9 |
9 |
10 Network interface names should match one of the names listed in |
10 Network interface names should match one of the names listed in |
11 "B<tshark -D>" (described above); a number, as reported by |
11 "B<tshark -D>" (described above); a number, as reported by |
12 -"B<tshark -D>", can also be used. If you're using UNIX, "B<netstat |
12 -"B<tshark -D>", can also be used. If you're using UNIX, "B<netstat |
13 --i>" or "B<ifconfig -a>" might also work to list interface names, |
13 --i>" or "B<ifconfig -a>" might also work to list interface names, |
18 +"any" can be used to capture packets from all interfaces. Note that |
18 +"any" can be used to capture packets from all interfaces. Note that |
19 +captures using "any" will not be done in promiscuous mode. |
19 +captures using "any" will not be done in promiscuous mode. |
20 |
20 |
21 If no interface is specified, B<TShark> searches the list of |
21 If no interface is specified, B<TShark> searches the list of |
22 interfaces, choosing the first non-loopback interface if there are any |
22 interfaces, choosing the first non-loopback interface if there are any |
23 @@ -1551,7 +1553,7 @@ |
23 @@ -1587,7 +1587,7 @@ |
24 |
24 |
25 =head1 CAPTURE FILTER SYNTAX |
25 =head1 CAPTURE FILTER SYNTAX |
26 |
26 |
27 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), |
27 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), |
28 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1), |
28 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1), |
29 or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. |
29 or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. |
30 |
30 |
31 =head1 READ FILTER SYNTAX |
31 =head1 READ FILTER SYNTAX |
32 @@ -1812,7 +1814,7 @@ |
32 @@ -1862,7 +1862,7 @@ |
33 =head1 SEE ALSO |
33 =head1 SEE ALSO |
34 |
34 |
35 wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1), |
35 wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1), |
36 -text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) |
36 -text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) |
37 +text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) |
37 +text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) |
38 |
38 |
39 =head1 NOTES |
39 =head1 NOTES |
40 |
40 |
41 --- doc/wireshark.pod.template |
41 --- doc/wireshark.pod.template |
42 +++ doc/wireshark.pod.template |
42 +++ doc/wireshark.pod.template |
43 @@ -366,9 +366,9 @@ |
43 @@ -370,9 +370,9 @@ |
44 |
44 |
45 Network interface names should match one of the names listed in |
45 Network interface names should match one of the names listed in |
46 "B<wireshark -D>" (described above); a number, as reported by |
46 "B<wireshark -D>" (described above); a number, as reported by |
47 -"B<wireshark -D>", can also be used. If you're using UNIX, "B<netstat |
47 -"B<wireshark -D>", can also be used. If you're using UNIX, "B<netstat |
48 --i>" or "B<ifconfig -a>" might also work to list interface names, |
48 --i>" or "B<ifconfig -a>" might also work to list interface names, |
51 +that are displayed with the command "dladm show-link" or "ipadm show-if" |
51 +that are displayed with the command "dladm show-link" or "ipadm show-if" |
52 +can be used with the "-i" command line option. |
52 +can be used with the "-i" command line option. |
53 |
53 |
54 If no interface is specified, B<Wireshark> searches the list of |
54 If no interface is specified, B<Wireshark> searches the list of |
55 interfaces, choosing the first non-loopback interface if there are any |
55 interfaces, choosing the first non-loopback interface if there are any |
56 @@ -2529,7 +2529,7 @@ |
56 @@ -2533,7 +2533,7 @@ |
57 |
57 |
58 =head1 CAPTURE FILTER SYNTAX |
58 =head1 CAPTURE FILTER SYNTAX |
59 |
59 |
60 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), |
60 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8), |
61 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1), |
61 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1), |
62 or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. |
62 or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>. |
63 |
63 |
64 =head1 DISPLAY FILTER SYNTAX |
64 =head1 DISPLAY FILTER SYNTAX |
65 @@ -2901,7 +2901,7 @@ |
65 @@ -2905,7 +2905,7 @@ |
66 =head1 SEE ALSO |
66 =head1 SEE ALSO |
67 |
67 |
68 wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1), |
68 wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1), |
69 -text2pcap(1), pcap-filter(7) or tcpdump(8) |
69 -text2pcap(1), pcap-filter(7) or tcpdump(8) |
70 +text2pcap(1), pcap-filter(5) or tcpdump(1) |
70 +text2pcap(1), pcap-filter(5) or tcpdump(1) |
122 |
122 |
123 =head1 NOTES |
123 =head1 NOTES |
124 |
124 |
125 --- doc/rawshark.pod |
125 --- doc/rawshark.pod |
126 +++ doc/rawshark.pod |
126 +++ doc/rawshark.pod |
127 @@ -522,7 +522,7 @@ |
127 @@ -520,7 +520,7 @@ |
128 =head1 SEE ALSO |
128 =head1 SEE ALSO |
129 |
129 |
130 wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1), |
130 wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1), |
131 -text2pcap(1), pcap-filter(7) or tcpdump(8) |
131 -text2pcap(1), pcap-filter(7) or tcpdump(8) |
132 +text2pcap(1), pcap-filter(5) or tcpdump(1) |
132 +text2pcap(1), pcap-filter(5) or tcpdump(1) |