diff options
| author |   jakob <jakob@openbsd.org> | 2012-01-29 11:23:24 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2012-01-29 11:23:24 +0000 |
| commit | 5bcb494be38ba5295a64197d7f25257138734657 (patch) | |
| tree | 0a3bffd3fd03f22f843e0b2dc8cfcf29d620ba7f /usr.sbin/nsd/nsd.conf.5.in | |
| parent | regen (diff) | |
| download | wireguard-openbsd-5bcb494be38ba5295a64197d7f25257138734657.tar.xz wireguard-openbsd-5bcb494be38ba5295a64197d7f25257138734657.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/nsd.conf.5.in')
| -rw-r--r-- | usr.sbin/nsd/nsd.conf.5.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/nsd/nsd.conf.5.in b/usr.sbin/nsd/nsd.conf.5.in index a2d8ee5ded5..b062ff4ace6 100644 --- a/usr.sbin/nsd/nsd.conf.5.in +++ b/usr.sbin/nsd/nsd.conf.5.in @@ -1,4 +1,4 @@ -.TH "nsd.conf" "5" "Mar 22, 2011" "NLnet Labs" "nsd 3.2.8" +.TH "nsd.conf" "5" "Nov 23, 2011" "NLnet Labs" "nsd 3.2.9" .\" Copyright (c) 2001\-2011, NLnet Labs. All rights reserved. .\" See LICENSE for the license. .SH "NAME" @@ -217,7 +217,7 @@ gone. For more details see the section on zone expiry behavior of NSD. Default is .IR @xfrdfile@ . .TP -.B xrfd\-reload\-timeout:\fR <number> +.B xfrd\-reload\-timeout:\fR <number> If this value is \-1, xfrd will not trigger a reload after a zone transfer. If positive xfrd will trigger a reload after a zone transfer, then it will wait for the number of seconds before it will @@ -350,7 +350,7 @@ file format, named.conf(5). BIND9 types zones as 'Master' or 'Slave'. .SS "Slave zones" For a slave zone, the master servers are listed. The master servers are queried for zone data, and are listened to for update notifications. -In NSD these two properties need to be configured seperately, by listing +In NSD these two properties need to be configured separately, by listing the master address in allow\-notify and request\-xfr statements. .P In BIND9 you only need to provide allow\-notify elements for @@ -444,7 +444,7 @@ that are also allowed to send notifications to this slave server. For a master zone in BIND9, the slave servers are listed. These slave servers are sent notifications of updated and are allowed to request transfer of the zone data. In NSD these two properties need to be -configured seperately. +configured separately. .P Here is an example of a master zone in BIND9 syntax. .LP |