Merge pull request #159 from uniontech-lilinjie/master

fix typos

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

20 files changed, 24 insertions, 24 deletions

diff --git a/ChangeLog.md b/ChangeLog.md
index cfe649e..7ca083e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -110,7 +110,7 @@ Release curated by Sam Roberts.
 - pblock_append deals with raw memory and structs, so declare it correctly
   (Sam Roberts)
 - Clarified types and sizes of DHCP/BOOTP chaddr, sname, and file. chaddr is a
-  hardware address, with size specified seperately, whereas sname and file are
+  hardware address, with size specified separately, whereas sname and file are
   null terminated strings. (Sam Roberts)
 - Explicitly ignore return value of write (some systems now warn about this).
   (Sam Roberts)
@@ -279,7 +279,7 @@ Release curated by Sam Roberts.
   message. (Sam Roberts)
 - man doc makefile wasn't correctly referring to the srcdir
   (alon.barlev@gmail.com) (Sam Roberts)
-- autotools patches for cross compiling and seperate builddir
+- autotools patches for cross compiling and separate builddir
   (alon.barlev@gmail.com) (Sam Roberts)
 - html doc makefile wasn't correctly referring to the srcdir
   (alon.barlev@gmail.com) (Sam Roberts)
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 1592290..f7b5c9c 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -117,7 +117,7 @@
     - Presence of linux's PF_PACKET sockets is now detected. The acinclude.m4 merged in from packetfactory's 1.1.3-rc branch mysteriously assumed that that there was no PF_PACKET if the target OS was linux, which is the opposite of what we want. (Sam Roberts)
     - Fix libnet_build_igmp() to not reverse the order of the ip address. libnet APIs that take IP addresses as a uint32_t expect them to already be in network byte order. (Sam Roberts)
     - pblock_append deals with raw memory and structs, so declare it correctly (Sam Roberts)
-    - Clarified types and sizes of DHCP/BOOTP chaddr, sname, and file. chaddr is a hardware address, with size specified seperately, whereas sname and file are null terminated strings. (Sam Roberts)
+    - Clarified types and sizes of DHCP/BOOTP chaddr, sname, and file. chaddr is a hardware address, with size specified separately, whereas sname and file are null terminated strings. (Sam Roberts)
     - Explicitly ignore return value of write (some systems now warn about this). (Sam Roberts)
     - Synchronize comment about h_len with parameter name in function. (Sam Roberts)
     - Fixes a buffer overflow issue when copying chaddr, file, and sname fields to the DHCP header. (allfro)
@@ -177,7 +177,7 @@
     - With link_none, the link apis were failing with not error message. (Sam Roberts)
     - man doc makefile wasn't correctly referring to the srcdir (alon.barlev@gmail.com) (Sam Roberts)
     - Avoid mallocing zero bytes, it perturbs electric fence. (Sam Roberts)
-    - autotools patches for cross compiling and seperate builddir (alon.barlev@gmail.com) (Sam Roberts)
+    - autotools patches for cross compiling and separate builddir (alon.barlev@gmail.com) (Sam Roberts)
     - html doc makefile wasn't correctly referring to the srcdir (alon.barlev@gmail.com) (Sam Roberts)
     - ip_offset is now calculated on the fly, and UDP and TCP no longer use h_len (Sam Roberts)
     - IP offset calculation should allow nesting of IP protocols. (Sam Roberts)
diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4
index 732eaf7..b6a2834 100644
--- a/m4/ax_prog_doxygen.m4
+++ b/m4/ax_prog_doxygen.m4
@@ -21,7 +21,7 @@
 #   The DX_*_FEATURE macros control the default setting for the given
 #   Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for
 #   generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML
-#   help (for MS users), 'CHI' for generating a seperate .chi file by the
+#   help (for MS users), 'CHI' for generating a separate .chi file by the
 #   .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate
 #   output formats. The environment variable DOXYGEN_PAPER_SIZE may be
 #   specified to override the default 'a4wide' paper size.
@@ -321,8 +321,8 @@ DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation],
              DX_ENV_APPEND(GENERATE_HTMLHELP, YES)],
             [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)])
 
-# Seperate CHI file generation.
-DX_ARG_ABLE(chi, [generate doxygen seperate compressed HTML help index file],
+# Separate CHI file generation.
+DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file],
             [DX_CHECK_DEPEND(chm, 1)],
             [DX_CLEAR_DEPEND(chm, 1)],
             [],
diff --git a/sample/bgp4_hdr.c b/sample/bgp4_hdr.c
index a99e9b3..c468add 100644
--- a/sample/bgp4_hdr.c
+++ b/sample/bgp4_hdr.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/bgp4_notification.c b/sample/bgp4_notification.c
index fb725ae..509f4ca 100644
--- a/sample/bgp4_notification.c
+++ b/sample/bgp4_notification.c
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/bgp4_open.c b/sample/bgp4_open.c
index 17f50fd..5384295 100644
--- a/sample/bgp4_open.c
+++ b/sample/bgp4_open.c
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/bgp4_update.c b/sample/bgp4_update.c
index d86d0bd..716b7e8 100644
--- a/sample/bgp4_update.c
+++ b/sample/bgp4_update.c
@@ -149,7 +149,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/fddi_tcp1.c b/sample/fddi_tcp1.c
index 38374d8..1819c0a 100644
--- a/sample/fddi_tcp1.c
+++ b/sample/fddi_tcp1.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/fddi_tcp2.c b/sample/fddi_tcp2.c
index d8fee23..8f29954 100644
--- a/sample/fddi_tcp2.c
+++ b/sample/fddi_tcp2.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/mpls.c b/sample/mpls.c
index 23174d6..8641d0d 100644
--- a/sample/mpls.c
+++ b/sample/mpls.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/ntp.c b/sample/ntp.c
index b2ad9e0..36250d2 100644
--- a/sample/ntp.c
+++ b/sample/ntp.c
@@ -68,7 +68,7 @@ main(int argc, char **argv)
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/rpc_tcp.c b/sample/rpc_tcp.c
index fe898a9..a9bdce6 100644
--- a/sample/rpc_tcp.c
+++ b/sample/rpc_tcp.c
@@ -77,7 +77,7 @@ main(int argc, char **argv)
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/rpc_udp.c b/sample/rpc_udp.c
index b041c3c..57a8dd4 100644
--- a/sample/rpc_udp.c
+++ b/sample/rpc_udp.c
@@ -81,7 +81,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/synflood.c b/sample/synflood.c
index 8c45720..b62933c 100644
--- a/sample/synflood.c
+++ b/sample/synflood.c
@@ -81,7 +81,7 @@ main(int argc, char **argv)
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 't':
diff --git a/sample/tcp1.c b/sample/tcp1.c
index 3fe025c..dbf7cec 100644
--- a/sample/tcp1.c
+++ b/sample/tcp1.c
@@ -74,7 +74,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/tcp2.c b/sample/tcp2.c
index b2cad74..50d7410 100644
--- a/sample/tcp2.c
+++ b/sample/tcp2.c
@@ -76,7 +76,7 @@ main(int argc, char **argv)
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/tftp.c b/sample/tftp.c
index d625ac1..e6d6d29 100644
--- a/sample/tftp.c
+++ b/sample/tftp.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/tring_tcp1.c b/sample/tring_tcp1.c
index 850564a..9c3ca8f 100644
--- a/sample/tring_tcp1.c
+++ b/sample/tring_tcp1.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/tring_tcp2.c b/sample/tring_tcp2.c
index ceeadfb..cb99e45 100644
--- a/sample/tring_tcp2.c
+++ b/sample/tring_tcp2.c
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':
diff --git a/sample/udp1.c b/sample/udp1.c
index ff406dc..b12022e 100644
--- a/sample/udp1.c
+++ b/sample/udp1.c
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
             /*
              *  We expect the input to be of the form `ip.ip.ip.ip.port`.  We
              *  point cp to the last dot of the IP address/port string and
-             *  then seperate them with a NULL byte.  The optarg now points to
+             *  then separate them with a NULL byte.  The optarg now points to
              *  just the IP address, and cp points to the port.
              */
             case 'd':