diff options
author | Josh Soref <jsoref@gmail.com> | 2017-02-06 16:14:04 +0000 |
---|---|---|
committer | Simon Kelley <simon@thekelleys.org.uk> | 2017-02-06 16:14:04 +0000 |
commit | 730c6745f020c80e5f630907f423987323f747ae (patch) | |
tree | 18a37b8546844f314db0d7bb566a3aae887efe6b /contrib | |
parent | d42d4706bbcce3b5a40ad778a5a356a997db6b34 (diff) | |
download | dnsmasq-730c6745f020c80e5f630907f423987323f747ae.tar.gz |
Comprehensive spelling/typo fixes.
Thanks to Josh Soref for generating these fixes.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/MacOSX-launchd/launchd-README.txt | 2 | ||||
-rw-r--r-- | contrib/Suse/README.susefirewall | 4 | ||||
-rw-r--r-- | contrib/conntrack/README | 6 | ||||
-rw-r--r-- | contrib/lease-access/lease.access.patch | 2 | ||||
-rw-r--r-- | contrib/lease-tools/dhcp_lease_time.c | 2 | ||||
-rw-r--r-- | contrib/lease-tools/dhcp_release.c | 2 | ||||
-rw-r--r-- | contrib/lease-tools/dhcp_release6.c | 4 | ||||
-rw-r--r-- | contrib/port-forward/portforward | 2 | ||||
-rw-r--r-- | contrib/reverse-dns/README | 2 | ||||
-rw-r--r-- | contrib/reverse-dns/reverse_replace.sh | 4 | ||||
-rw-r--r-- | contrib/try-all-ns/README-2.47 | 2 | ||||
-rw-r--r-- | contrib/webmin/README | 4 | ||||
-rw-r--r-- | contrib/wrt/README | 4 |
13 files changed, 20 insertions, 20 deletions
diff --git a/contrib/MacOSX-launchd/launchd-README.txt b/contrib/MacOSX-launchd/launchd-README.txt index 4783221..cf245ff 100644 --- a/contrib/MacOSX-launchd/launchd-README.txt +++ b/contrib/MacOSX-launchd/launchd-README.txt @@ -22,7 +22,7 @@ sudo chmod 644 /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist Optionally, edit your dnsmasq configuration file to your liking. -To start the launchd job, which starts dnsmaq, reboot or use the command: +To start the launchd job, which starts dnsmasq, reboot or use the command: sudo launchctl load /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist To stop the launchd job, which stops dnsmasq, use the command: diff --git a/contrib/Suse/README.susefirewall b/contrib/Suse/README.susefirewall index 2f19ca6..0b94108 100644 --- a/contrib/Suse/README.susefirewall +++ b/contrib/Suse/README.susefirewall @@ -1,9 +1,9 @@ This is a patch against SuSEfirewall2-3.1-206 (SuSE 9.x and older) -It fixes the depancy from the dns daemon name 'named' +It fixes the dependency from the dns daemon name 'named' After appending the patch, the SuSEfirewall is again able to autodetect the dnsmasq named service. This is a very old bug in the SuSEfirewall script. -The SuSE people think the name of the dns server will allways 'named' +The SuSE people think the name of the dns server will always 'named' --- /sbin/SuSEfirewall2.orig 2004-01-23 13:30:09.000000000 +0100 diff --git a/contrib/conntrack/README b/contrib/conntrack/README index c0d17aa..e883447 100644 --- a/contrib/conntrack/README +++ b/contrib/conntrack/README @@ -13,10 +13,10 @@ connection comes out of the other side. However, sometimes, we want to maintain that relationship through the proxy and continue the connection mark on packets upstream of our proxy -DNSMasq includes such a feature enabled by the --conntrack +Dnsmasq includes such a feature enabled by the --conntrack option. This allows, for example, using iptables to mark traffic from a particular IP, and that mark to be persisted to requests made *by* -DNSMasq. Such a feature could be useful for bandwidth accounting, +Dnsmasq. Such a feature could be useful for bandwidth accounting, captive portals and the like. Note a similar feature has been implemented in Squid 2.2 @@ -40,7 +40,7 @@ on IP address. 3) Saves the firewall mark back to the connection mark (which will persist it across related packets) 4) is applied to the OUTPUT table, which is where we first see packets -generated locally. DNSMasq will have already copied the firewall mark +generated locally. Dnsmasq will have already copied the firewall mark from the request, across to the new packet, and so all that remains is for iptables to copy it to the connection mark so it's persisted across packets. diff --git a/contrib/lease-access/lease.access.patch b/contrib/lease-access/lease.access.patch index ad76e25..911ee7e 100644 --- a/contrib/lease-access/lease.access.patch +++ b/contrib/lease-access/lease.access.patch @@ -55,7 +55,7 @@ Index: src/dnsmasq.c } @@ -434,7 +433,7 @@ - /* lose the setuid and setgid capbilities */ + /* lose the setuid and setgid capabilities */ if (capset(hdr, data) == -1) { - send_event(err_pipe[1], EVENT_CAP_ERR, errno); diff --git a/contrib/lease-tools/dhcp_lease_time.c b/contrib/lease-tools/dhcp_lease_time.c index b438ef7..fc00ff1 100644 --- a/contrib/lease-tools/dhcp_lease_time.c +++ b/contrib/lease-tools/dhcp_lease_time.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) *(p++) = 1; *(p++) = DHCPINFORM; - /* Explicity request the lease time, it won't be sent otherwise: + /* Explicitly request the lease time, it won't be sent otherwise: this is a dnsmasq extension, not standard. */ *(p++) = OPTION_REQUESTED_OPTIONS; *(p++) = 1; diff --git a/contrib/lease-tools/dhcp_release.c b/contrib/lease-tools/dhcp_release.c index a51f04b..201fcd3 100644 --- a/contrib/lease-tools/dhcp_release.c +++ b/contrib/lease-tools/dhcp_release.c @@ -117,7 +117,7 @@ static ssize_t netlink_recv(int fd) msg.msg_flags = 0; while ((rc = recvmsg(fd, &msg, MSG_PEEK)) == -1 && errno == EINTR); - /* 2.2.x doesn't suport MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a + /* 2.2.x doesn't support MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a big buffer and pray in that case. */ if (rc == -1 && errno == EOPNOTSUPP) { diff --git a/contrib/lease-tools/dhcp_release6.c b/contrib/lease-tools/dhcp_release6.c index 00ff115..1eee873 100644 --- a/contrib/lease-tools/dhcp_release6.c +++ b/contrib/lease-tools/dhcp_release6.c @@ -1,7 +1,7 @@ /* dhcp_release6 --iface <interface> --client-id <client-id> --server-id server-id --iaid <iaid> --ip <IP> [--dry-run] [--help] - MUST be run as root - will fail othewise + MUST be run as root - will fail otherwise */ /* Send a DHCPRELEASE message to IPv6 multicast address via the specified interface @@ -22,7 +22,7 @@ IP is an IPv6 adress to release - If --dry-run is specified, dhcp_release6 just prints hexadecimal represantation of + If --dry-run is specified, dhcp_release6 just prints hexadecimal representation of packet to send to stdout and exits. If --help is specified, dhcp_release6 print usage information to stdout and exits diff --git a/contrib/port-forward/portforward b/contrib/port-forward/portforward index 1a97c3a..21fdca1 100644 --- a/contrib/port-forward/portforward +++ b/contrib/port-forward/portforward @@ -3,7 +3,7 @@ # first column of this file, then a DNAT port-forward will be set up # to the address which has just been allocated by DHCP . The second field # is port number(s). If there is only one, then the port-forward goes to -# the same port on the DHCP-client, if there are two seperated with a +# the same port on the DHCP-client, if there are two separated with a # colon, then the second number is the port to which the connection # is forwarded on the DHCP-client. By default, forwarding is set up # for TCP, but it can done for UDP instead by prefixing the port to "u". diff --git a/contrib/reverse-dns/README b/contrib/reverse-dns/README index 2ec4df1..9fd4efb 100644 --- a/contrib/reverse-dns/README +++ b/contrib/reverse-dns/README @@ -1,6 +1,6 @@ The script reads stdin and replaces all IP addresses with names before
outputting it again. IPs from private networks are reverse looked up
-via dns. Other IP adresses are searched for in the dnsmasq query log.
+via dns. Other IP addresses are searched for in the dnsmasq query log.
This gives names (CNAMEs if I understand DNS correctly) that are closer
to the name the client originally asked for then the names obtained by
reverse lookup. Just run
diff --git a/contrib/reverse-dns/reverse_replace.sh b/contrib/reverse-dns/reverse_replace.sh index 5b4aebd..c6401fb 100644 --- a/contrib/reverse-dns/reverse_replace.sh +++ b/contrib/reverse-dns/reverse_replace.sh @@ -5,10 +5,10 @@ # Parses stdin for IP4 addresses and replaces them # with names retrieved by parsing the dnsmasq log. # This currently only gives CNAMEs. But these -# usually tell ou more than the mones from reverse +# usually tell you more than the ones from reverse # lookups. # -# This has been tested on debian and asuswrt. Plese +# This has been tested on debian and asuswrt. Please # report successful tests on other platforms. # # Author: Joachim Zobel <jz-2014@heute-morgen.de> diff --git a/contrib/try-all-ns/README-2.47 b/contrib/try-all-ns/README-2.47 index 3ebec65..bfe4ec7 100644 --- a/contrib/try-all-ns/README-2.47 +++ b/contrib/try-all-ns/README-2.47 @@ -2,7 +2,7 @@ A remake of patch Bob Carroll had posted to dnsmasq, now compatible with version 2.47. Hopefully he doesn't mind (sending a copy of this mail to him too). -Maybe the patch in question is not acceptible +Maybe the patch in question is not acceptable as it doesn't add new switch, rather it binds itself to "strict-order". What it does is: if you have strict-order in the diff --git a/contrib/webmin/README b/contrib/webmin/README index 8a8f937..2278871 100644 --- a/contrib/webmin/README +++ b/contrib/webmin/README @@ -1,5 +1,5 @@ -This is the README for the DNSmasq webmin module. +This is the README for the Dnsmasq webmin module. Problems: @@ -48,7 +48,7 @@ wade through the config file and man pages again. If you modify it, or add a language file, and you have a spare moment, please e-mail me - I won't be upset at all if you fix my poor coding! -(rather the opposite - I'd be pleased someone found it usefull) +(rather the opposite - I'd be pleased someone found it useful) Cheers, Neil Fisher <neil@magnecor.com.au> diff --git a/contrib/wrt/README b/contrib/wrt/README index 862046f..981db9f 100644 --- a/contrib/wrt/README +++ b/contrib/wrt/README @@ -4,7 +4,7 @@ reboot, then it will eventually be restored as hosts renew their leases. Until a host renews (which may take hours/days) it will not exist in the DNS if dnsmasq's DDNS function is in use. -*WRT systems remount all non-volatile fileystems read-only after boot, +*WRT systems remount all non-volatile filesystems read-only after boot, so the normal leasefile will not work. They do, however have NV storage, accessed with the nvram command: @@ -62,7 +62,7 @@ about 100 bytes, so restricting the number of leases to 50 will limit use to half that. (The default limit in the distributed source is 150) Any UI script which reads the dnsmasq leasefile will have to be -ammended, probably by changing it to read the output of +amended, probably by changing it to read the output of `lease_update init` instead. |