|
|
cab8d5 |
From a66d36ea1112c861ad2f11ed40cc26973873e5be Mon Sep 17 00:00:00 2001
|
|
|
cab8d5 |
From: Tomas Hozza <thozza@redhat.com>
|
|
|
cab8d5 |
Date: Mon, 22 Apr 2013 15:08:07 +0100
|
|
|
cab8d5 |
Subject: [PATCH] Manpage typos.
|
|
|
cab8d5 |
|
|
|
cab8d5 |
---
|
|
|
cab8d5 |
man/dnsmasq.8 | 18 +++++++++---------
|
|
|
cab8d5 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
cab8d5 |
|
|
|
cab8d5 |
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
|
|
|
cab8d5 |
index 96d8938..fc12b1c 100644
|
|
|
cab8d5 |
--- a/man/dnsmasq.8
|
|
|
cab8d5 |
+++ b/man/dnsmasq.8
|
|
|
cab8d5 |
@@ -559,7 +559,7 @@ needed for a client to do validation itself.
|
|
|
cab8d5 |
.B --auth-zone=<domain>[,<subnet>[,<subnet>.....]]
|
|
|
cab8d5 |
Define a DNS zone for which dnsmasq acts as authoritative server. Locally defined DNS records which are in the domain
|
|
|
cab8d5 |
will be served, except that A and AAAA records must be in one of the
|
|
|
cab8d5 |
-specified subnets, or in a subnet corresponding to a contructed DHCP
|
|
|
cab8d5 |
+specified subnets, or in a subnet corresponding to a constructed DHCP
|
|
|
cab8d5 |
range. The subnet(s) are also used to define in-addr.arpa and
|
|
|
cab8d5 |
ipv6.arpa domains which are served for reverse-DNS queries. For IPv4
|
|
|
cab8d5 |
subnets, the prefix length is limited to the values 8, 16 or 24.
|
|
|
cab8d5 |
@@ -763,7 +763,7 @@ This is
|
|
|
cab8d5 |
useful when there is another DHCP server on the network which should
|
|
|
cab8d5 |
be used by some machines.
|
|
|
cab8d5 |
|
|
|
cab8d5 |
-The set:<tag> contruct sets the tag
|
|
|
cab8d5 |
+The set:<tag> construct sets the tag
|
|
|
cab8d5 |
whenever this dhcp-host directive is in use. This can be used to
|
|
|
cab8d5 |
selectively send DHCP options just for this host. More than one tag
|
|
|
cab8d5 |
can be set in a dhcp-host directive (but not in other places where
|
|
|
cab8d5 |
@@ -978,7 +978,7 @@ agent ID and one provided by a relay agent, the tag is set.
|
|
|
cab8d5 |
(IPv4 only) A normal DHCP relay agent is only used to forward the initial parts of
|
|
|
cab8d5 |
a DHCP interaction to the DHCP server. Once a client is configured, it
|
|
|
cab8d5 |
communicates directly with the server. This is undesirable if the
|
|
|
cab8d5 |
-relay agent is addding extra information to the DHCP packets, such as
|
|
|
cab8d5 |
+relay agent is adding extra information to the DHCP packets, such as
|
|
|
cab8d5 |
that used by
|
|
|
cab8d5 |
.B dhcp-circuitid
|
|
|
cab8d5 |
and
|
|
|
cab8d5 |
@@ -995,7 +995,7 @@ relays at those addresses are affected.
|
|
|
cab8d5 |
Without a value, set the tag if the client sends a DHCP
|
|
|
cab8d5 |
option of the given number or name. When a value is given, set the tag only if
|
|
|
cab8d5 |
the option is sent and matches the value. The value may be of the form
|
|
|
cab8d5 |
-"01:ff:*:02" in which case the value must match (apart from widcards)
|
|
|
cab8d5 |
+"01:ff:*:02" in which case the value must match (apart from wildcards)
|
|
|
cab8d5 |
but the option sent may have unmatched data past the end of the
|
|
|
cab8d5 |
value. The value may also be of the same form as in
|
|
|
cab8d5 |
.B dhcp-option
|
|
|
cab8d5 |
@@ -1008,7 +1008,7 @@ will set the tag "efi-ia32" if the the number 6 appears in the list of
|
|
|
cab8d5 |
architectures sent by the client in option 93. (See RFC 4578 for
|
|
|
cab8d5 |
details.) If the value is a string, substring matching is used.
|
|
|
cab8d5 |
|
|
|
cab8d5 |
-The special form with vi-encap:<enterpise number> matches against
|
|
|
cab8d5 |
+The special form with vi-encap:<enterprise number> matches against
|
|
|
cab8d5 |
vendor-identifying vendor classes for the specified enterprise. Please
|
|
|
cab8d5 |
see RFC 3925 for more details of these rare and interesting beasts.
|
|
|
cab8d5 |
.TP
|
|
|
cab8d5 |
@@ -1036,7 +1036,7 @@ dhcp-host configuration in dnsmasq and the contents of /etc/hosts and
|
|
|
cab8d5 |
.TP
|
|
|
cab8d5 |
.B --dhcp-generate-names=tag:<tag>[,tag:<tag>]
|
|
|
cab8d5 |
(IPv4 only) Generate a name for DHCP clients which do not otherwise have one,
|
|
|
cab8d5 |
-using the MAC address expressed in hex, seperated by dashes. Note that
|
|
|
cab8d5 |
+using the MAC address expressed in hex, separated by dashes. Note that
|
|
|
cab8d5 |
if a host provides a name, it will be used by preference to this,
|
|
|
cab8d5 |
unless
|
|
|
cab8d5 |
.B --dhcp-ignore-names
|
|
|
cab8d5 |
@@ -1113,7 +1113,7 @@ timeout has elapsed with no keyboard input, the first available menu
|
|
|
cab8d5 |
option will be automatically executed. If the timeout is zero then the first available menu
|
|
|
cab8d5 |
item will be executed immediately. If
|
|
|
cab8d5 |
.B pxe-prompt
|
|
|
cab8d5 |
-is ommitted the system will wait for user input if there are multiple
|
|
|
cab8d5 |
+is omitted the system will wait for user input if there are multiple
|
|
|
cab8d5 |
items in the menu, but boot immediately if
|
|
|
cab8d5 |
there is only one. See
|
|
|
cab8d5 |
.B pxe-service
|
|
|
cab8d5 |
@@ -1412,7 +1412,7 @@ In the default mode, dnsmasq inserts the unqualified names of
|
|
|
cab8d5 |
DHCP clients into the DNS. For this reason, the names must be unique,
|
|
|
cab8d5 |
even if two clients which have the same name are in different
|
|
|
cab8d5 |
domains. If a second DHCP client appears which has the same name as an
|
|
|
cab8d5 |
-existing client, the name is transfered to the new client. If
|
|
|
cab8d5 |
+existing client, the name is transferred to the new client. If
|
|
|
cab8d5 |
.B --dhcp-fqdn
|
|
|
cab8d5 |
is set, this behaviour changes: the unqualified name is no longer
|
|
|
cab8d5 |
put in the DNS, only the qualified name. Two DHCP clients with the
|
|
|
cab8d5 |
@@ -1666,7 +1666,7 @@ used to allocate the address, one from any matching
|
|
|
cab8d5 |
The tag "bootp" is set for BOOTP requests, and a tag whose name is the
|
|
|
cab8d5 |
name of the interface on which the request arrived is also set.
|
|
|
cab8d5 |
|
|
|
cab8d5 |
-Any configuration lines which includes one or more tag:<tag> contructs
|
|
|
cab8d5 |
+Any configuration lines which include one or more tag:<tag> constructs
|
|
|
cab8d5 |
will only be valid if all that tags are matched in the set derived
|
|
|
cab8d5 |
above. Typically this is dhcp-option.
|
|
|
cab8d5 |
.B dhcp-option
|
|
|
cab8d5 |
--
|
|
|
cab8d5 |
1.8.1.4
|
|
|
cab8d5 |
|