dhcpcd-discuss

Signed-off-by: Anatol Pomozov <anatol.pomozov@xxxxxxxxx>
---
 README                   | 2 +-
 arp.c                    | 2 +-
 dev.c                    | 2 +-
 dhcp6.c                  | 2 +-
 dhcpcd-hooks/30-hostname | 2 +-
 dhcpcd-hooks/50-ntp.conf | 2 +-
 dhcpcd-run-hooks.8.in    | 2 +-
 dhcpcd.c                 | 2 +-
 dhcpcd.conf.5.in         | 6 +++---
 duid.c                   | 2 +-
 if-linux-wireless.c      | 2 +-
 ipv6nd.c                 | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 028d64f..2125315 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ you can change this by passing shell commands to --service-exists,
 
 Some systems have /dev management systems and some of these like to rename
 interfaces. As this system would listen in the same way as dhcpcd to new
-interface arrivals, dhcpcd needs to listen to the /dev management sytem
+interface arrivals, dhcpcd needs to listen to the /dev management system
 instead of the kernel. However, if the /dev management system breaks, stops
 working, or changes to a new one, dhcpcd should still try and continue to work.
 To facilitate this, dhcpcd allows a plugin to load to instruct dhcpcd when it
diff --git a/arp.c b/arp.c
index 4623090..67b5849 100644
--- a/arp.c
+++ b/arp.c
@@ -245,7 +245,7 @@ arp_announce(void *arg)
 	}
 	if (state->new->cookie != htonl(MAGIC_COOKIE)) {
 		/* We should pretend to be at the end
-		 * of the DHCP negotation cycle unless we rebooted */
+		 * of the DHCP negotiation cycle unless we rebooted */
 		if (state->interval != 0)
 			state->interval = 64;
 		state->probes = 0;
diff --git a/dev.c b/dev.c
index b33a3e0..7273ac2 100644
--- a/dev.c
+++ b/dev.c
@@ -151,7 +151,7 @@ dev_handle_data(__unused void *arg)
 {
 
 	if (dev->handle_device() == -1) {
-		/* XXX: an error occured. should we restart dev? */
+		/* XXX: an error occurred. should we restart dev? */
 	}
 }
 
diff --git a/dhcp6.c b/dhcp6.c
index fbdc8a4..afe5e1d 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -2470,7 +2470,7 @@ dhcp6_freedrop(struct interface *ifp, int drop, const char *reason)
 	/*
 	 * As the interface is going away from dhcpcd we need to
 	 * remove the delegated addresses, otherwise we lose track
-	 * of which interface is delegating as we remeber it by pointer.
+	 * of which interface is delegating as we remember it by pointer.
 	 * So if we need to change this behaviour, we need to change
 	 * how we remember which interface delegated.
 	 * To make it more interesting, on some OS's with PPP links
diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
index 616fb82..81a1d51 100644
--- a/dhcpcd-hooks/30-hostname
+++ b/dhcpcd-hooks/30-hostname
@@ -9,7 +9,7 @@
 # This could lead to an inconsistent hostname on a DHCPv4 and DHCPv6 network
 # where the DHCPv4 hostname is short and the DHCPv6 has an FQDN.
 # DHCPv6 has no hostname option.
-# RFC4702 section 3.1 says FQDN should be prefered over hostname.
+# RFC4702 section 3.1 says FQDN should be preferred over hostname.
 #
 # As such, the default is hostname_fqdn=true so that a consistent hostname
 # is always assigned.
diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf
index c078136..8c899af 100644
--- a/dhcpcd-hooks/50-ntp.conf
+++ b/dhcpcd-hooks/50-ntp.conf
@@ -9,7 +9,7 @@
 # to use openntpd from pkgsrc instead of the system provided ntp.
 
 if type invoke-rc.d >/dev/null 2>&1; then
-	# Debian has a seperate file for DHCP config to avoid stamping on
+	# Debian has a separate file for DHCP config to avoid stamping on
 	# the master.
 	[ -e /var/lib/ntp ] || mkdir /var/lib/ntp
 	: ${ntp_service:=ntp}
diff --git a/dhcpcd-run-hooks.8.in b/dhcpcd-run-hooks.8.in
index b078f07..e8b6ff3 100644
--- a/dhcpcd-run-hooks.8.in
+++ b/dhcpcd-run-hooks.8.in
@@ -122,7 +122,7 @@ interface.
 This is primarily used to test the variables are filled correctly for the
 script to process them.
 .It Dv ROUTERADVERT
-dhcpcd has received an IPv6 Router Advertisment, or one has expired.
+dhcpcd has received an IPv6 Router Advertisement, or one has expired.
 .El
 .Sh FILES
 When
diff --git a/dhcpcd.c b/dhcpcd.c
index 6e5bc03..d74205a 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -489,7 +489,7 @@ handle_carrier(int carrier, int flags, const char *ifname)
 
 	if (carrier == LINK_UNKNOWN)
 		syslog(LOG_ERR, "%s: carrier_status: %m", ifname);
-	/* IFF_RUNNING is checked, if needed, earlier and is OS dependant */
+	/* IFF_RUNNING is checked, if needed, earlier and is OS dependent */
 	else if (carrier == LINK_DOWN || (ifp->flags & IFF_UP) == 0) {
 		if (ifp->carrier != LINK_DOWN) {
 			if (ifp->carrier == LINK_UP)
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 74f28bb..d9684d5 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -257,7 +257,7 @@ Set this option so to make
 .Nm dhcpcd
 always fork on an RA.
 .It Ic ipv6ra_own
-Disables kernel IPv6 Router Advertisment processing so dhcpcd can manage
+Disables kernel IPv6 Router Advertisement processing so dhcpcd can manage
 addresses and routes.
 This does not work reliably on any BSD system, probably due to kernel issues.
 .It Ic ipv6ra_own_default
@@ -267,7 +267,7 @@ This allows dhcpcd to prefer an interface for outbound traffic based on metric
 and/or user selection rather than the kernel.
 This does work reliably on BSD systems.
 .It Ic ipv6rs
-Enables IPv6 Router Advertisment solicitation.
+Enables IPv6 Router Advertisement solicitation.
 This is on by default, but is documented here in the case where it is disabled
 globally but needs to be enabled for one interface.
 .It Ic leasetime Ar seconds
@@ -356,7 +356,7 @@ A setting of 0 seconds causes
 to skip the REBOOT phase and go straight into DISCOVER.
 This is desirable for mobile users because if you change from network A to
 network B and they use the same subnet and the address from network A isn't
-in use on network B, then the DHCP server will remain silent even if authorative
+in use on network B, then the DHCP server will remain silent even if authoritative
 which means
 .Nm dhcpcd
 will timeout before moving back to the DISCOVER phase.
diff --git a/duid.c b/duid.c
index a119828..dec8c8c 100644
--- a/duid.c
+++ b/duid.c
@@ -113,7 +113,7 @@ duid_get(unsigned char *d, const struct interface *ifp)
 
 	/* No file? OK, lets make one based on our interface */
 	if (ifp->family == ARPHRD_NETROM) {
-		syslog(LOG_WARNING, "%s: is a NET/ROM psuedo interface",
+		syslog(LOG_WARNING, "%s: is a NET/ROM pseudo interface",
 		    ifp->name);
 		TAILQ_FOREACH(ifp2, ifaces, next) {
 			if (ifp2->family != ARPHRD_NETROM)
diff --git a/if-linux-wireless.c b/if-linux-wireless.c
index 2d9519e..a71d124 100644
--- a/if-linux-wireless.c
+++ b/if-linux-wireless.c
@@ -84,7 +84,7 @@ getifssid(const char *ifname, char *ssid)
 	close(s);
 	return retval;
 #else
-	/* Stop gcc warning about unused paramters */
+	/* Stop gcc warning about unused parameters */
 	ifname = ssid;
 	return -1;
 #endif
diff --git a/ipv6nd.c b/ipv6nd.c
index b066112..160747e 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -638,7 +638,7 @@ ipv6nd_handlera(struct interface *ifp, struct icmp6_hdr *icp, ssize_t len)
 		return;
 	}
 
-	/* We could recieve a RA before we sent a RS*/
+	/* We could receive a RA before we sent a RS*/
 	if (ipv6_linklocal(ifp) == NULL) {
 #ifdef DEBUG_RS
 		syslog(LOG_DEBUG, "%s: received RA from %s (no link-local)",
-- 
1.8.4.2