Spelling fixes.
diff --git a/CHANGELOG b/CHANGELOG
index a4ee280..86cec72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,7 +51,7 @@
Add DNSMASQ_REQUESTED_OPTIONS environment variable to the
lease-change script. Thanks to ZHAO Yu for the patch.
- Fix foobar in rrfilter code, that could cause misformed
+ Fix foobar in rrfilter code, that could cause malformed
replies, especially when DNSSEC validation on, and
the upstream server returns answer with the RRs in a
particular order. The only DNS server known to tickle
@@ -65,7 +65,7 @@
Thanks to Kevin Darbyshire-Bryant and Eric Luehrsen
for pushing this.
- Improve connection handling when talking to TCP upsteam
+ Improve connection handling when talking to TCP upstream
servers. Specifically, be prepared to open a new TCP
connection when we want to make multiple queries
but the upstream server accepts fewer queries per connection.
@@ -468,7 +468,7 @@
conf-file=/path/to/trust-anchors.conf
dnssec
- to your config is all thats needed to get things
+ to your config is all that's needed to get things
working. The upstream nameservers have to be DNSSEC-capable
too, of course. Many ISP nameservers aren't, but the
Google public nameservers (8.8.8.8 and 8.8.4.4) are.
@@ -656,7 +656,7 @@
we can't use SO_BINDTODEVICE. Thanks to Natrio for the bug
report.
- Increase timeout/number of retries in TFTP to accomodate
+ Increase timeout/number of retries in TFTP to accommodate
AudioCodes Voice Gateways doing streaming writes to flash.
Thanks to Damian Kaczkowski for spotting the problem.
@@ -924,7 +924,7 @@
still-born attempt to allow automatic isolated
configuration by libvirt, but have never (to my knowledge)
been used, had very strange semantics, and have been
- superceded by other mechanisms.
+ superseded by other mechanisms.
Fixed bug logging filenames when duplicate dhcp-host
addresses are found. Thanks to John Hanks for the patch.
@@ -957,7 +957,7 @@
version 2.62
Update German translation. Thanks to Conrad Kostecki.
- Cope with router-solict packets wich don't have a valid
+ Cope with router-solict packets which don't have a valid
source address. Thanks to Vladislav Grishenko for the patch.
Fixed bug which caused missing periodic router
@@ -1211,7 +1211,7 @@
Relax the need to supply a netmask in --dhcp-range for
networks which use a DHCP relay. Whilst this is still
- desireable, in the absence of a netmask dnsmasq will use
+ desirable, in the absence of a netmask dnsmasq will use
a default based on the class (A, B, or C) of the address.
This should at least remove a cause of mysterious failure
for people using RFC1918 addresses and relays.
@@ -1325,7 +1325,7 @@
Add --add-mac option. This is to support currently
experimental DNS filtering facilities. Thanks to Benjamin
- Petrin for the orignal patch.
+ Petrin for the original patch.
Fix bug which meant that tags were ignored in dhcp-range
configuration specifying PXE-proxy service. Thanks to
diff --git a/CHANGELOG.archive b/CHANGELOG.archive
index 859ab18..2df495b 100644
--- a/CHANGELOG.archive
+++ b/CHANGELOG.archive
@@ -78,7 +78,7 @@
ids, to thwart DNS spoofers.
(7) Dnsmasq no longer forwards queries when the
"recursion desired" bit is not set in the header.
- (8) Fixed getopt code to work on compliers with unsigned char.
+ (8) Fixed getopt code to work on compilers with unsigned char.
release 0.991 Added -b flag: when set causes dnsmasq to always answer
reverse queries on the RFC 1918 private IP space itself and
@@ -319,7 +319,7 @@
uClinux. Thanks to Matthew Natalier for uClinux stuff.
release 1.10 Log warnings if resolv.conf or dhcp.leases are not
- accessable for any reason, as suggested by Hinrich Eilts.
+ accessible for any reason, as suggested by Hinrich Eilts.
Fixed wrong address printing in error message about
no interface with address.
@@ -975,7 +975,7 @@
configuration. Specifically: (1) options are matched on
the netids from dhcp-range, dhcp-host, vendor class and
user class(es). Multiple net-ids are allowed and options
- are searched on them all. (2) matches agains vendor class
+ are searched on them all. (2) matches against vendor class
and user class are now on a substring, if the given
string is a substring of the vendor/user class, then a
match occurs. Thanks again to Richard Musil for prompting
@@ -1019,7 +1019,7 @@
broken. The new algorithm is to pick as before for the
first try, but if a query is retried, to send to all
available servers in parallel. The first one to reply
- then becomes prefered for the next query. This should
+ then becomes preferred for the next query. This should
improve reliability without generating significant extra
upstream load.
@@ -1229,7 +1229,7 @@
Set NONBLOCK on all listening sockets to workaround non-POSIX
compliance in Linux 2.4 and 2.6. This fixes rare hangs which
- occured when corrupted packets were received. Thanks to
+ occurred when corrupted packets were received. Thanks to
Joris van Rantwijk for chasing that down.
Updated config.h for NetBSD. Thanks to Martin Lambers.
@@ -1297,7 +1297,7 @@
interfaces with more than one IPv6 address. Thanks to
Martin Pels for help with that.
- Fix problems which occured when more than one dhcp-range
+ Fix problems which occurred when more than one dhcp-range
was specified in the same subnet: sometimes parameters
(lease time, network-id tag) from the wrong one would be
used. Thanks to Rory Campbell-Lange for the bug report.
@@ -1740,7 +1740,7 @@
Fixed regression in netlink code under 2.2.x kernels which
occurred in 2.27. Erik Jan Tromp is the vintage kernel fan
who found this. P.S. It looks like this "netlink bind:
- permission denied" problem occured in kernels at least as
+ permission denied" problem occurred in kernels at least as
late a 2.4.18. Good information from Alain Richoux.
Added a warning when it's impossible to give a host its
diff --git a/FAQ b/FAQ
index 3366cf5..b97855c 100644
--- a/FAQ
+++ b/FAQ
@@ -156,7 +156,7 @@
If you get "jlsdajkdalld.com" does not exist, then all is fine, if
host returns an IP address, then the DNS is broken. (Try a few
- different unlikely domains, just in case you picked a wierd one
+ different unlikely domains, just in case you picked a weird one
which really _is_ registered.)
Assuming that your DNS is broken, and you want to fix it, simply
diff --git a/contrib/lease-tools/dhcp_release6.c b/contrib/lease-tools/dhcp_release6.c
index 1eee873..2e0beff 100644
--- a/contrib/lease-tools/dhcp_release6.c
+++ b/contrib/lease-tools/dhcp_release6.c
@@ -20,7 +20,7 @@
The iaid argument is numeric string and mandatory. Normally
it can be found in leases file both on client and server.
- IP is an IPv6 adress to release
+ IP is an IPv6 address to release
If --dry-run is specified, dhcp_release6 just prints hexadecimal representation of
packet to send to stdout and exits.
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index 82f7965..4ba788f 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -1476,7 +1476,7 @@
provides dnsmasq the data required to create a DUID-EN type DUID. Note
that once set, the DUID is stored in the lease database, so to change between DUID-EN and
automatically created DUIDs or vice-versa, the lease database must be
-re-intialised. The enterprise-id is assigned by IANA, and the uid is a
+re-initialised. The enterprise-id is assigned by IANA, and the uid is a
string of hex octets unique to a particular device.
.TP
.B \-6 --dhcp-script=<path>
@@ -1606,7 +1606,7 @@
.B --dhcp-luascript=<path>
Specify a script written in Lua, to be run when leases are created,
destroyed or changed. To use this option, dnsmasq must be compiled
-with the correct support. The Lua interpreter is intialised once, when
+with the correct support. The Lua interpreter is initialised once, when
dnsmasq starts, so that global variables persist between lease
events. The Lua code must define a
.B lease
diff --git a/src/config.h b/src/config.h
index cf527b3..5602369 100644
--- a/src/config.h
+++ b/src/config.h
@@ -132,7 +132,7 @@
NO_LARGEFILE
NO_AUTH
NO_INOTIFY
- these are avilable to explicitly disable compile time options which would
+ these are available to explicitly disable compile time options which would
otherwise be enabled automatically (HAVE_IPV6, >2Gb file sizes) or
which are enabled by default in the distributed source tree. Building dnsmasq
with something like "make COPTS=-DNO_SCRIPT" will do the trick.
diff --git a/src/dhcp.c b/src/dhcp.c
index 13825da..08952c8 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -496,7 +496,7 @@
3) Fills in local (this host) and router (this host or relay) addresses.
4) Links contexts which are valid for hosts directly connected to the arrival interface on ->current.
- Note that the current chain may be superceded later for configured hosts or those coming via gateways. */
+ Note that the current chain may be superseded later for configured hosts or those coming via gateways. */
static int complete_context(struct in_addr local, int if_index, char *label,
struct in_addr netmask, struct in_addr broadcast, void *vparam)
diff --git a/src/forward.c b/src/forward.c
index 3f4e6a3..169310c 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -1328,7 +1328,7 @@
struct irec *iface;
/* get the netmask of the interface which has the address we were sent to.
- This is no neccessarily the interface we arrived on. */
+ This is no necessarily the interface we arrived on. */
for (iface = daemon->interfaces; iface; iface = iface->next)
if (iface->addr.sa.sa_family == AF_INET &&
diff --git a/src/inotify.c b/src/inotify.c
index 083f7d3..7c49490 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -104,7 +104,7 @@
strcpy(path, res->name);
- /* Follow symlinks until we reach a non-symlink, or a non-existant file. */
+ /* Follow symlinks until we reach a non-symlink, or a non-existent file. */
while ((new_path = my_readlink(path)))
{
if (links-- == 0)
diff --git a/src/rfc1035.c b/src/rfc1035.c
index c007dca..3a238f0 100644
--- a/src/rfc1035.c
+++ b/src/rfc1035.c
@@ -1184,7 +1184,7 @@
if (crecp->flags & F_IMMORTAL)
return crecp->ttd;
- /* Return the Max TTL value if it is lower then the actual TTL */
+ /* Return the Max TTL value if it is lower than the actual TTL */
if (daemon->max_ttl == 0 || ((unsigned)(crecp->ttd - now) < daemon->max_ttl))
return crecp->ttd - now;
else
@@ -1520,7 +1520,7 @@
enumerate_interfaces(0);
- /* See if a putative address is on the network from which we recieved
+ /* See if a putative address is on the network from which we received
the query, is so we'll filter other answers. */
if (local_addr.s_addr != 0 && option_bool(OPT_LOCALISE) && type == T_A)
for (intr = daemon->int_names; intr; intr = intr->next)