components/wireshark/patches/man.patch
branchs11-update
changeset 2788 5d4a0834a077
parent 2332 63e5f5feab4b
child 3878 b6ed43d2d1b8
equal deleted inserted replaced
2787:f6f36f8682b5 2788:5d4a0834a077
     1 --- doc/tshark.pod
     1 --- doc/tshark.pod
     2 +++ doc/tshark.pod
     2 +++ doc/tshark.pod
     3 @@ -439,9 +439,9 @@
     3 @@ -449,9 +449,9 @@
     4  
     4  
     5  Network interface names should match one of the names listed in
     5  Network interface names should match one of the names listed in
     6  "B<tshark -D>" (described above); a number, as reported by
     6  "B<tshark -D>" (described above); a number, as reported by
     7 -"B<tshark -D>", can also be used.  If you're using UNIX, "B<netstat
     7 -"B<tshark -D>", can also be used.  If you're using UNIX, "B<netstat
     8 --i>" or "B<ifconfig -a>" might also work to list interface names,
     8 --i>" or "B<ifconfig -a>" might also work to list interface names,
    11 +that are displayed with the command "dladm show-link" or "ipadm show-if"
    11 +that are displayed with the command "dladm show-link" or "ipadm show-if"
    12 +can be used with the "-i" command line option.
    12 +can be used with the "-i" command line option.
    13  
    13  
    14  If no interface is specified, B<TShark> searches the list of
    14  If no interface is specified, B<TShark> searches the list of
    15  interfaces, choosing the first non-loopback interface if there are any
    15  interfaces, choosing the first non-loopback interface if there are any
    16 @@ -1328,7 +1328,7 @@
    16 @@ -1403,7 +1403,7 @@
    17  
    17  
    18  =head1 CAPTURE FILTER SYNTAX
    18  =head1 CAPTURE FILTER SYNTAX
    19  
    19  
    20 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    20 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    21 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    21 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    22  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    22  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    23  
    23  
    24  =head1 READ FILTER SYNTAX
    24  =head1 READ FILTER SYNTAX
    25 @@ -1589,7 +1589,7 @@
    25 @@ -1672,7 +1672,7 @@
    26  =head1 SEE ALSO
    26  =head1 SEE ALSO
    27  
    27  
    28  wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1),
    28  wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1),
    29 -text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
    29 -text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8)
    30 +text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
    30 +text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1)
    31  
    31  
    32  =head1 NOTES
    32  =head1 NOTES
    33  
    33  
    34 --- doc/wireshark.pod.template
    34 --- doc/wireshark.pod.template
    35 +++ doc/wireshark.pod.template
    35 +++ doc/wireshark.pod.template
    36 @@ -354,9 +354,9 @@
    36 @@ -363,9 +363,9 @@
    37  
    37  
    38  Network interface names should match one of the names listed in
    38  Network interface names should match one of the names listed in
    39  "B<wireshark -D>" (described above); a number, as reported by
    39  "B<wireshark -D>" (described above); a number, as reported by
    40 -"B<wireshark -D>", can also be used.  If you're using UNIX, "B<netstat
    40 -"B<wireshark -D>", can also be used.  If you're using UNIX, "B<netstat
    41 --i>" or "B<ifconfig -a>" might also work to list interface names,
    41 --i>" or "B<ifconfig -a>" might also work to list interface names,
    44 +that are displayed with the command "dladm show-link" or "ipadm show-if"
    44 +that are displayed with the command "dladm show-link" or "ipadm show-if"
    45 +can be used with the "-i" command line option.
    45 +can be used with the "-i" command line option.
    46  
    46  
    47  If no interface is specified, B<Wireshark> searches the list of
    47  If no interface is specified, B<Wireshark> searches the list of
    48  interfaces, choosing the first non-loopback interface if there are any
    48  interfaces, choosing the first non-loopback interface if there are any
    49 @@ -2435,7 +2435,7 @@
    49 @@ -2457,7 +2457,7 @@
    50  
    50  
    51  =head1 CAPTURE FILTER SYNTAX
    51  =head1 CAPTURE FILTER SYNTAX
    52  
    52  
    53 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    53 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    54 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    54 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    55  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    55  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    56  
    56  
    57  =head1 DISPLAY FILTER SYNTAX
    57  =head1 DISPLAY FILTER SYNTAX
    58 @@ -2807,7 +2807,7 @@
    58 @@ -2837,7 +2837,7 @@
    59  =head1 SEE ALSO
    59  =head1 SEE ALSO
    60  
    60  
    61  wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1),
    61  wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1),
    62 -text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
    62 -text2pcap(1), pcap-filter(7) or tcpdump(8)
    63 +text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
    63 +text2pcap(1), pcap-filter(5) or tcpdump(1)
    64  
    64  
    65  =head1 NOTES
    65  =head1 NOTES
    66  
    66  
    67 --- doc/capinfos.pod
    67 --- doc/capinfos.pod
    68 +++ doc/capinfos.pod
    68 +++ doc/capinfos.pod
    69 @@ -320,7 +320,7 @@
    69 @@ -332,7 +332,7 @@
    70  =head1 SEE ALSO
    70  =head1 SEE ALSO
    71  
    71  
    72  pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    72  pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    73 -dumpcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist
    73 -dumpcap(1), pcap-filter(7) or tcpdump(8)
    74 +dumpcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist
    74 +dumpcap(1), pcap-filter(5) or tcpdump(1)
    75  
    75  
    76  =head1 NOTES
    76  =head1 NOTES
    77  
    77  
    78 --- doc/dumpcap.pod
    78 --- doc/dumpcap.pod
    79 +++ doc/dumpcap.pod
    79 +++ doc/dumpcap.pod
    80 @@ -314,13 +314,13 @@
    80 @@ -342,13 +342,13 @@
    81  
    81  
    82  =head1 CAPTURE FILTER SYNTAX
    82  =head1 CAPTURE FILTER SYNTAX
    83  
    83  
    84 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    84 -See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
    85 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    85 +See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
    86  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    86  or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
    87  
    87  
    88  =head1 SEE ALSO
    88  =head1 SEE ALSO
    89  
    89  
    90  wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap(3),
    90  wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap(3),
    91 -pcap-filter(7) or tcpdump(8) if it doesn't exist.
    91 -pcap-filter(7) or tcpdump(8)
    92 +pcap-filter(5) or tcpdump(1) if it doesn't exist.
    92 +pcap-filter(5) or tcpdump(1)
    93  
    93  
    94  =head1 NOTES
    94  =head1 NOTES
    95  
    95  
    96 --- doc/editcap.pod
    96 --- doc/editcap.pod
    97 +++ doc/editcap.pod
    97 +++ doc/editcap.pod
    98 @@ -369,7 +369,7 @@
    98 @@ -339,7 +339,7 @@
    99  =head1 SEE ALSO
    99  =head1 SEE ALSO
   100  
   100  
   101  pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1),
   101  pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1),
   102 -text2pcap(1), od(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
   102 -text2pcap(1), od(1), pcap-filter(7) or tcpdump(8)
   103 +text2pcap(1), od(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
   103 +text2pcap(1), od(1), pcap-filter(5) or tcpdump(1)
   104  
   104  
   105  =head1 NOTES
   105  =head1 NOTES
   106  
   106  
   107 --- doc/mergecap.pod
   107 --- doc/mergecap.pod
   108 +++ doc/mergecap.pod
   108 +++ doc/mergecap.pod
   109 @@ -134,7 +134,7 @@
   109 @@ -134,7 +134,7 @@
   110  =head1 SEE ALSO
   110  =head1 SEE ALSO
   111  
   111  
   112  pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),
   112  pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),
   113 -pcap-filter(7) or tcpdump(8) if it doesn't exist.
   113 -pcap-filter(7) or tcpdump(8)
   114 +pcap-filter(5) or tcpdump(1) if it doesn't exist.
   114 +pcap-filter(5) or tcpdump(1)
   115  
   115  
   116  =head1 NOTES
   116  =head1 NOTES
   117  
   117  
   118 --- doc/rawshark.pod
   118 --- doc/rawshark.pod
   119 +++ doc/rawshark.pod
   119 +++ doc/rawshark.pod
   120 @@ -493,7 +493,7 @@
   120 @@ -507,7 +507,7 @@
   121  =head1 SEE ALSO
   121  =head1 SEE ALSO
   122  
   122  
   123  wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1),
   123  wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1),
   124 -text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
   124 -text2pcap(1), pcap-filter(7) or tcpdump(8)
   125 +text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
   125 +text2pcap(1), pcap-filter(5) or tcpdump(1)
   126  
   126  
   127  =head1 NOTES
   127  =head1 NOTES
   128  
   128  
   129 --- doc/text2pcap.pod
   129 --- doc/text2pcap.pod
   130 +++ doc/text2pcap.pod
   130 +++ doc/text2pcap.pod
   131 @@ -211,7 +211,7 @@
   131 @@ -223,7 +223,7 @@
   132  =head1 SEE ALSO
   132  =head1 SEE ALSO
   133  
   133  
   134  od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   134  od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   135 -editcap(1), strptime(3), pcap-filter(7) or tcpdump(8) if it doesn't exist.
   135 -editcap(1), strptime(3), pcap-filter(7) or tcpdump(8)
   136 +editcap(1), strptime(3), pcap-filter(5) or tcpdump(1) if it doesn't exist.
   136 +editcap(1), strptime(3), pcap-filter(5) or tcpdump(1)
   137  
   137  
   138  =head1 NOTES
   138  =head1 NOTES
   139  
   139  
   140 --- doc/wireshark-filter.pod
   140 --- doc/wireshark-filter.pod
   141 +++ doc/wireshark-filter.pod
   141 +++ doc/wireshark-filter.pod
   142 @@ -422,13 +422,13 @@
   142 @@ -414,13 +414,13 @@
   143  the Perl-Compatible Regular Expressions library: see B<http://www.pcre.org/>.
   143  See L<http://developer.gnome.org/glib/2.32/glib-regex-syntax.html/> or L<http://www.pcre.org/> for more information.
   144  
   144  
   145  This manpage does not describe the capture filter syntax, which is
   145  This manpage does not describe the capture filter syntax, which is
   146 -different. See the manual page of pcap-filter(7) or, if that doesn't exist,
   146 -different. See the manual page of pcap-filter(7) or, if that doesn't exist,
       
   147 -tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   147 +different. See the manual page of pcap-filter(5) or, if that doesn't exist,
   148 +different. See the manual page of pcap-filter(5) or, if that doesn't exist,
   148  tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   149 +tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   149  for a description of capture filters.
   150  for a description of capture filters.
   150  
   151  
   151  =head1 SEE ALSO
   152  =head1 SEE ALSO
   152  
   153  
   153 -wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(7) or tcpdump(8) if it
   154 -wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(7) or tcpdump(8) if it