]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch
BUG11177: pppoe password not required anymore
[ipfire-2.x.git] / src / patches / dnsmasq / 004-Fix_editing_error_on_man_page.patch
CommitLineData
a4fdc176
MF
1From 5874f3e9222397d82aabd9884d9bf5ce7e4109b0 Mon Sep 17 00:00:00 2001
2From: Simon Kelley <simon@thekelleys.org.uk>
3Date: Sun, 10 Jul 2016 22:12:08 +0100
4Subject: [PATCH] Fix editing error on man page.
5
6Thanks to Eric Westbrook for spotting this.
7---
8 man/dnsmasq.8 | 9 ++++-----
9 1 file changed, 4 insertions(+), 5 deletions(-)
10
11diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
12index 0521534..bd8c0b3 100644
13--- a/man/dnsmasq.8
14+++ b/man/dnsmasq.8
15@@ -1037,6 +1037,10 @@ is given, then read all the files contained in that directory. The advantage of
16 using this option is the same as for --dhcp-hostsfile: the
17 dhcp-optsfile will be re-read when dnsmasq receives SIGHUP. Note that
18 it is possible to encode the information in a
19+.B --dhcp-boot
20+flag as DHCP options, using the options names bootfile-name,
21+server-ip-address and tftp-server. This allows these to be included
22+in a dhcp-optsfile.
23 .TP
24 .B --dhcp-hostsdir=<path>
25 This is equivalent to dhcp-hostsfile, except for the following. The path MUST be a
26@@ -1048,11 +1052,6 @@ is restarted; ie host records are only added dynamically.
27 .TP
28 .B --dhcp-optsdir=<path>
29 This is equivalent to dhcp-optsfile, with the differences noted for --dhcp-hostsdir.
30-.TP
31-.B --dhcp-boot
32-flag as DHCP options, using the options names bootfile-name,
33-server-ip-address and tftp-server. This allows these to be included
34-in a dhcp-optsfile.
35 .TP
36 .B \-Z, --read-ethers
37 Read /etc/ethers for information about hosts for the DHCP server. The
38--
391.7.10.4
40