gemfile: add json requirement.

[web.git] / docs / uci_dnsmasq.txt

diff --git a/docs/uci_dnsmasq.txt b/docs/uci_dnsmasq.txt
index 764bbbcf3cff761b445dbc10ac23f79c0755568f..fa789190b7bc4f38a08b6537defd3aa56d79e29b 100644 (file)
--- a/docs/uci_dnsmasq.txt
+++ b/docs/uci_dnsmasq.txt
@@ -1,8 +1,8 @@
+---
+---
 DNS and DHCP configuration
 ==========================
 
-include::uci_menu.inc[]
-
 == DNS and DHCP configuration
 
 The _dnsmasq_ and dhcpd configuration is located in **'/etc/config/dhcp'** and controls both DNS and DHCP server options on the device.
@@ -111,7 +111,7 @@ config 'dhcp' 'lan'
        option dhcpv6 server
 ----
 
-* 'lan' specifies the OpenWrt interface that is served by this DHCP pool
+* 'lan' specifies the LEDE interface that is served by this DHCP pool
 * '100' is the offset from the network address, in the default configuration this would mean start leasing addresses from '192.168.1.100'
 * '150' is the maximum number of addresses that may be leased, in the default configuration this would mean leasing addresses up to '192.168.1.250'
 * '12h' specifies the time to live for handed out leases, twelve hours in this example
@@ -229,7 +229,7 @@ This tells the client to load pxelinux.0 from the server at 192.168.1.2, and mou
 
 DHCP can provide the client with numerous options, such as the domain name, NTP servers, network booting options, etc. While some settings are applicable to all hosts in a network segment, other are more specific and apply only to a group of hosts, or even only a single one. _dnsmasq_ offers to group DHCP options and their values by a _network-id_, an alphanumeric identifier, and sending options only to hosts which have been tagged with that _network-id_.
 
-In OpenWrt, you can tag hosts by the DHCP range they're in (section 'dhcp'), or a number of options the client might send with their DHCP request. In each of these sections, you can use the 'dhcp_option' list to add DHCP options to be sent to hosts with this _network-id_.
+In LEDE, you can tag hosts by the DHCP range they're in (section 'dhcp'), or a number of options the client might send with their DHCP request. In each of these sections, you can use the 'dhcp_option' list to add DHCP options to be sent to hosts with this _network-id_.
 
 Each classifying section has two configuration options: the value of the DHCP option used to distinguish clients, and the _network-id_ that these clients should be tagged with. Here's a template:
 
@@ -352,9 +352,6 @@ Note that you shouldn't use this as a security feature to prevent unwanted clien
 Define a custom domain name and the corresponding PTR record - assigns the IP address '192.168.1.140' to the domain name 'typhoon' and construct an appropriate reverse record '140.1.168.192.in-addr.arpa'. It works like an entry in '/etc/hosts' but more flexible
 and integrated.
 
-*CAUTION*: Note that this currently only works for IPv4 addresses and that this functionality is not present in release prior to 8.09.2 .
-*CAUTION*: Note that reverse records are not properly generated at present. (Barrier Breaker 14.07-RC2)
-
 ----
 config 'domain'
        option 'name' 'typhoon'
@@ -479,7 +476,7 @@ config dhcp lan
 Test:
 
 ----
-root@OpenWrt:~# ipcalc.sh 10.0.0.1 255.0.0.0 1441793 253
+root@lede:~# ipcalc.sh 10.0.0.1 255.0.0.0 1441793 253
 IP=10.0.0.1
 NETMASK=255.0.0.0
 BROADCAST=10.255.255.255
@@ -487,7 +484,7 @@ NETWORK=10.0.0.0
 PREFIX=8
 START=10.22.0.1
 END=10.22.0.254
-root@OpenWrt:~#
+root@lede:~#
 ----
 
 === Classifying Clients And Assigning Individual Options