components/wireshark/patches/man.patch
changeset 735 5a99bd9fadaf
parent 567 17ac3785d1bc
child 888 0e69712495b1
equal deleted inserted replaced
734:730cc64572b5 735:5a99bd9fadaf
     1 --- doc/tshark.pod.orig	Wed Oct 19 10:42:24 2011
     1 --- doc/tshark.pod
     2 +++ doc/tshark.pod	Wed Oct 19 10:44:12 2011
     2 +++ doc/tshark.pod
     3 @@ -406,9 +406,9 @@
     3 @@ -419,9 +419,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 @@ -996,7 +996,7 @@
    16 @@ -1102,7 +1102,7 @@
    17  
    17  
    18  =head1 CAPTURE FILTER SYNTAX
    18  =head1 CAPTURE FILTER SYNTAX
    19  
    19  
    20 -See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
    20 -See the manual page of pcap-filter(4) 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 @@ -1228,7 +1228,7 @@
    25 @@ -1355,7 +1355,7 @@
    26  
    26  
    27  =head1 SEE ALSO
    27  =head1 SEE ALSO
    28  
    28  
    29 -wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(4), tcpdump(8),
    29 -wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(4), tcpdump(8),
    30 +wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(5), tcpdump(1),
    30 +wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(5), tcpdump(1),
    31  pcap(3), dumpcap(1), text2pcap(1), mergecap(1)
    31  pcap(3), dumpcap(1), text2pcap(1), mergecap(1)
    32  
    32  
    33  =head1 NOTES
    33  =head1 NOTES
    34 --- doc/wireshark.pod.template.orig	Wed Oct 19 10:42:29 2011
    34 --- doc/wireshark.pod.template
    35 +++ doc/wireshark.pod.template	Wed Oct 19 10:43:51 2011
    35 +++ doc/wireshark.pod.template
    36 @@ -309,9 +309,9 @@
    36 @@ -309,9 +309,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
    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 @@ -2343,7 +2343,7 @@
    49 @@ -2349,7 +2349,7 @@
    50  
    50  
    51  =head1 CAPTURE FILTER SYNTAX
    51  =head1 CAPTURE FILTER SYNTAX
    52  
    52  
    53 -See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
    53 -See the manual page of pcap-filter(4) 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 @@ -2678,7 +2678,7 @@
    58 @@ -2705,7 +2705,7 @@
    59  
    59  
    60  =head1 SEE ALSO
    60  =head1 SEE ALSO
    61  
    61  
    62 -wireshark-filter(4), tshark(1), editcap(1), pcap-filter(4), tcpdump(8),
    62 -wireshark-filter(4), tshark(1), editcap(1), pcap-filter(4), tcpdump(8),
    63 +wireshark-filter(4), tshark(1), editcap(1), pcap-filter(5), tcpdump(1),
    63 +wireshark-filter(4), tshark(1), editcap(1), pcap-filter(5), tcpdump(1),
    64  pcap(3), dumpcap(1), mergecap(1), text2pcap(1)
    64  pcap(3), dumpcap(1), mergecap(1), text2pcap(1)
    65  
    65  
    66  =head1 NOTES
    66  =head1 NOTES
    67 --- doc/capinfos.pod.orig	Wed Oct 26 09:10:07 2011
    67 --- doc/capinfos.pod
    68 +++ doc/capinfos.pod	Wed Oct 26 09:10:26 2011
    68 +++ doc/capinfos.pod
    69 @@ -317,7 +317,7 @@
    69 @@ -319,7 +319,7 @@
    70  
    70  
    71  =head1 SEE ALSO
    71  =head1 SEE ALSO
    72  
    72  
    73 -tcpdump(8), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    73 -tcpdump(8), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    74 +tcpdump(1), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    74 +tcpdump(1), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
    75  dumpcap(1)
    75  dumpcap(1)
    76  
    76  
    77  =head1 NOTES
    77  =head1 NOTES
    78 --- doc/dumpcap.pod.orig	Wed Oct 26 09:13:27 2011
    78 --- doc/dumpcap.pod
    79 +++ doc/dumpcap.pod	Wed Oct 26 09:14:40 2011
    79 +++ doc/dumpcap.pod
    80 @@ -259,13 +259,13 @@
    80 @@ -265,13 +265,13 @@
    81  
    81  
    82  =head1 CAPTURE FILTER SYNTAX
    82  =head1 CAPTURE FILTER SYNTAX
    83  
    83  
    84 -See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
    84 -See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
    85 +See the manual page of pcap-filter(4) 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-filter(4),
    90 -wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(4),
    91 -tcpdump(8), pcap(3)
    91 -tcpdump(8), pcap(3)
       
    92 +wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(5),
    92 +tcpdump(1), pcap(3)
    93 +tcpdump(1), pcap(3)
    93  
    94  
    94  =head1 NOTES
    95  =head1 NOTES
    95  
    96  
    96 --- doc/editcap.pod.orig	Wed Oct 26 09:13:34 2011
    97 --- doc/editcap.pod
    97 +++ doc/editcap.pod	Wed Oct 26 09:14:47 2011
    98 +++ doc/editcap.pod
    98 @@ -340,7 +340,7 @@
    99 @@ -368,7 +368,7 @@
    99  
   100  
   100  =head1 SEE ALSO
   101  =head1 SEE ALSO
   101  
   102  
   102 -tcpdump(8), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
   103 -tcpdump(8), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
   103 +tcpdump(1), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
   104 +tcpdump(1), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
   104  capinfos(1), text2pcap(1), od(1)
   105  capinfos(1), text2pcap(1), od(1)
   105  
   106  
   106  =head1 NOTES
   107  =head1 NOTES
   107 --- doc/mergecap.pod.orig	Wed Oct 26 09:13:43 2011
   108 --- doc/mergecap.pod
   108 +++ doc/mergecap.pod	Wed Oct 26 09:14:55 2011
   109 +++ doc/mergecap.pod
   109 @@ -134,7 +134,7 @@
   110 @@ -134,7 +134,7 @@
   110  
   111  
   111  =head1 SEE ALSO
   112  =head1 SEE ALSO
   112  
   113  
   113 -tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
   114 -tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
   114 +tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
   115 +tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
   115  text2pcap(1)
   116  text2pcap(1)
   116  
   117  
   117  =head1 NOTES
   118  =head1 NOTES
   118 --- doc/rawshark.pod.orig	Wed Oct 26 09:13:52 2011
   119 --- doc/rawshark.pod
   119 +++ doc/rawshark.pod	Wed Oct 26 09:15:02 2011
   120 +++ doc/rawshark.pod
   120 @@ -467,7 +467,7 @@
   121 @@ -488,7 +488,7 @@
   121  
   122  
   122  =head1 SEE ALSO
   123  =head1 SEE ALSO
   123  
   124  
   124 -wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(8),
   125 -wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(8),
   125 +wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(1),
   126 +wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(1),
   126  pcap(3), dumpcap(1), text2pcap(1)
   127  pcap(3), dumpcap(1), text2pcap(1)
   127  
   128  
   128  =head1 NOTES
   129  =head1 NOTES
   129 --- doc/text2pcap.pod.orig	Wed Oct 26 09:14:00 2011
   130 --- doc/text2pcap.pod
   130 +++ doc/text2pcap.pod	Wed Oct 26 09:15:09 2011
   131 +++ doc/text2pcap.pod
   131 @@ -198,7 +198,7 @@
   132 @@ -202,7 +202,7 @@
   132  
   133  
   133  =head1 SEE ALSO
   134  =head1 SEE ALSO
   134  
   135  
   135 -od(1), tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   136 -od(1), tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   136 +od(1), tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   137 +od(1), tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
   137  editcap(1), strptime(3).
   138  editcap(1), strptime(3).
   138  
   139  
   139  =head1 NOTES
   140  =head1 NOTES
   140 --- doc/wireshark-filter.pod.template.orig	Wed Oct 26 09:14:08 2011
   141 --- doc/wireshark-filter.pod
   141 +++ doc/wireshark-filter.pod.template	Wed Oct 26 09:15:19 2011
   142 +++ doc/wireshark-filter.pod
   142 @@ -387,12 +387,12 @@
   143 @@ -400,13 +400,13 @@
       
   144  the Perl-Compatible Regular Expressions library: see B<http://www.pcre.org/>.
   143  
   145  
   144  This manpage does not describe the capture filter syntax, which is
   146  This manpage does not describe the capture filter syntax, which is
   145  different. See the manual page of pcap-filter(4) or, if that doesn't exist,
   147 -different. See the manual page of pcap-filter(4) or, if that doesn't exist,
   146 -tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   148 -tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
       
   149 +different. See the manual page of pcap-filter(5) or, if that doesn't exist,
   147 +tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   150 +tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
   148  for a description of capture filters.
   151  for a description of capture filters.
   149  
   152  
   150  =head1 SEE ALSO
   153  =head1 SEE ALSO
   151  
   154  
   152 -wireshark(1), tshark(1), editcap(1), pcap-filter(4), tcpdump(8), pcap(3)
   155 -wireshark(1), tshark(1), editcap(1), pcap-filter(4), tcpdump(8), pcap(3)
   153 +wireshark(1), tshark(1), editcap(1), pcap-filter(4), tcpdump(1), pcap(3)
   156 +wireshark(1), tshark(1), editcap(1), pcap-filter(5), tcpdump(1), pcap(3)
   154  
   157  
   155  =head1 AUTHORS
   158  =head1 AUTHORS
   156  
   159