summaryrefslogtreecommitdiff
path: root/setup.html
diff options
context:
space:
mode:
authorSeonah Moon <seonah1.moon@samsung.com>2018-06-21 15:44:41 +0900
committerSeonah Moon <seonah1.moon@samsung.com>2018-06-21 15:45:21 +0900
commit2b5ed83fec55f5d96338fe3ae5e394bed1a407f4 (patch)
treed3d74be1606f40615be2a5693efda635a3053c43 /setup.html
parent0ebdbc1d2fd08c1de37fa314ea02b51085dfb3d9 (diff)
downloaddnsmasq-2b5ed83fec55f5d96338fe3ae5e394bed1a407f4.tar.gz
dnsmasq-2b5ed83fec55f5d96338fe3ae5e394bed1a407f4.tar.bz2
dnsmasq-2b5ed83fec55f5d96338fe3ae5e394bed1a407f4.zip
Imported Upstream version 2.79upstream/2.79
Change-Id: I9a2f4c945e0481ab803bdf0c85921433f33a9256 Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
Diffstat (limited to 'setup.html')
-rw-r--r--setup.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/setup.html b/setup.html
index 482ff5d..fb80dab 100644
--- a/setup.html
+++ b/setup.html
@@ -78,7 +78,7 @@ by modifying MODIFY_RESOLV_CONF_DYNAMICALLY="no" in <TT>/etc/sysconfig/network/c
<h3>Automatic DNS server configuration with DHCP.</h3>
-You need to get your DHCP client to write the addresse(s) of the DNS
+You need to get your DHCP client to write the address(es) of the DNS
servers to a file other than <TT>/etc/resolv.conf</TT>. For dhcpcd, the
<TT>dhcpcd.exe</TT> script gets run with the addresses of the nameserver(s) in
the shell variable <TT>$DNS</TT>. The following bit of shell script
@@ -86,8 +86,8 @@ uses that to write a file suitable for dnsmasq.
<PRE>
echo -n >|/etc/dhcpc/resolv.conf
-dnsservs=${DNS//,/ }
-for serv in $dnsservs; do
+dnsservers=${DNS//,/ }
+for serv in $dnsservers; do
echo "nameserver $serv" >>/etc/dhcpc/resolv.conf
done
@@ -125,7 +125,7 @@ address of its ethernet card. For the former to work, a machine needs to know it
requests a DHCP lease. For dhcpcd, the -h option specifies this. The
names may be anything as far as DHCP is concerned, but dnsmasq adds
some limitations. By default the names must no have a domain part, ie
-they must just be a alphanumeric name, without any dots. This is a
+they must just be alphanumeric names, without any dots. This is a
security feature to stop a machine on your network telling DHCP that
its name is "www.microsoft.com" and thereby grabbing traffic which
shouldn't go to it. A domain part is only allowed by dnsmasq in DHCP machine names
@@ -186,7 +186,7 @@ more than one nameserver just include as many
<H2>Local domains.</H2>
Sometimes people have local domains which they do not want forwarded
-to upstream servers. This is accomodated by using server options
+to upstream servers. This is accommodated by using server options
without the server IP address. To make things clearer <TT>local</TT>
is a synonym for <TT>server</TT>. For example the option
<TT>local=/localnet/</TT> ensures that any domain name query which ends in