From Michael Shields <[email protected]> via Roman Francoise: spelling

fixes.

diff --git a/CHANGES b/CHANGES
index b4cdbbd2e696b026989019dcf9db180296cb11d2..9d17309ff36dc371c763d70324ccce444e0f1d6f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.7 2005-09-05 09:19:32 guy Exp $
+$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.8 2005-09-05 09:29:27 guy Exp $
 
 Mon.   September 5, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
        Decoder support for more Juniper link-layer types
@@ -12,6 +12,7 @@ Mon.  September 5, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
        Clean up documentation of vlan filter expression, document mpls
                filter expression.
        Document new pppoed and pppoes filter expressions.
+       Spelling fixes in ICMPv6.
 
 Tue.   July 5, 2005.  [email protected]. Summary for 3.9.3 tcpdump release
 

diff --git a/CREDITS b/CREDITS
index 9332defee62c730b2d3c554202bb8c2a60eccb68..8c52ae76c3fab62f7d1f63697b513bddc3f36604 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -85,6 +85,7 @@ Additional people who have contributed patches:
        Martin Husemann                 <[email protected]>
        Michael Madore                  <[email protected]>
        Michael Shalayeff               <[email protected]>
+       Michael Shields                 <[email protected]>
        Michael T. Stolarchuk           <[email protected]>
        Michele "mydecay" Marchetto     <[email protected]>
        Monroe Williams                 <[email protected]>

diff --git a/icmp6.h b/icmp6.h
index 2a3e997b5334c72d75beb8485e6359614f3d340e..3b782a4461c14b0aefc43fb47904e1231b7abcf0 100644 (file)
--- a/icmp6.h
+++ b/icmp6.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.16 2005-01-14 10:41:50 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.16.2.1 2005-09-05 09:29:28 guy Exp $ (LBL) */
 /*     $NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp $        */
 /*     $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $  */
 
@@ -104,9 +104,9 @@ struct icmp6_hdr {
 #define MLD6_LISTENER_DONE             132     /* multicast listener done */
 
 #define ND_ROUTER_SOLICIT              133     /* router solicitation */
-#define ND_ROUTER_ADVERT               134     /* router advertisment */
+#define ND_ROUTER_ADVERT               134     /* router advertisement */
 #define ND_NEIGHBOR_SOLICIT            135     /* neighbor solicitation */
-#define ND_NEIGHBOR_ADVERT             136     /* neighbor advertisment */
+#define ND_NEIGHBOR_ADVERT             136     /* neighbor advertisement */
 #define ND_REDIRECT                    137     /* redirect */
 
 #define ICMP6_ROUTER_RENUMBERING       138     /* router renumbering */

diff --git a/print-icmp6.c b/print-icmp6.c
index 51b73b3fe20ef7a4d3e7c2d6062f401ba94ec0b6..5bf0f7e130ae8acd6db0870ab3ab4d38a9aa6fd5 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.79.2.5 2005-07-11 20:24:32 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.79.2.6 2005-09-05 09:29:28 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -75,7 +75,7 @@ static struct tok icmp6_type_values[] = {
     { ND_ROUTER_SOLICIT, "router solicitation"},
     { ND_ROUTER_ADVERT, "router advertisement"},
     { ND_NEIGHBOR_SOLICIT, "neighbor solicitation"},
-    { ND_NEIGHBOR_ADVERT, "neighbor advertisment"},
+    { ND_NEIGHBOR_ADVERT, "neighbor advertisement"},
     { ND_REDIRECT, "redirect"},
     { ICMP6_ROUTER_RENUMBERING, "router renumbering"},
     { IND_SOLICIT, "inverse neighbor solicitation"},
@@ -131,7 +131,7 @@ static struct tok icmp6_opt_values[] = {
    { ND_OPT_PREFIX_INFORMATION, "prefix info"},
    { ND_OPT_REDIRECTED_HEADER, "redirected header"},
    { ND_OPT_MTU, "mtu"},
-   { ND_OPT_ADVINTERVAL, "advertisment interval"},
+   { ND_OPT_ADVINTERVAL, "advertisement interval"},
    { ND_OPT_HOMEAGENT_INFO, "homeagent information"},
    { ND_OPT_ROUTE_INFO, "route info"},
    { 0,        NULL }