diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-22 10:55:47 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-22 10:55:47 -0200 |
commit | 109a7ad1ec5fcb58bce8d91fa982b503050dcf06 (patch) | |
tree | d9e78329f327edd0a32a31a41466357b4210a662 /share/man | |
parent | cfe34c66a5ecf4b4d0db428dcaa83bc1959944e9 (diff) | |
parent | df0dedf653f6c09947ccd61ca9509629c4fb7d2f (diff) | |
download | FreeBSD-src-109a7ad1ec5fcb58bce8d91fa982b503050dcf06.zip FreeBSD-src-109a7ad1ec5fcb58bce8d91fa982b503050dcf06.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share/man')
-rw-r--r-- | share/man/man4/ddb.4 | 6 | ||||
-rw-r--r-- | share/man/man5/resolver.5 | 18 | ||||
-rw-r--r-- | share/man/man9/BUS_DESCRIBE_INTR.9 | 4 |
3 files changed, 20 insertions, 8 deletions
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 2ca5518..8bcbaea 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -60,7 +60,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 15, 2014 +.Dd November 5, 2015 .Dt DDB 4 .Os .Sh NAME @@ -572,8 +572,8 @@ The same as "show pcpu", but for every CPU present in the system. .Pp .It Ic show Cm allrman Show information related with resource management, including -interrupt request lines, DMA request lines, I/O ports and I/O memory -addresses. +interrupt request lines, DMA request lines, I/O ports, I/O memory +addresses, and Resource IDs. .\" .Pp .It Ic show Cm apic diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index 6c6c9aa..fa441a4 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -32,7 +32,7 @@ .\" @(#)resolver.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd December 25, 2013 +.Dd October 12, 2015 .Dt RESOLVER 5 .Os .Sh NAME @@ -179,6 +179,19 @@ the resolver from obeying the standard and .Sy search rules with the given name. +.It Sy reload-period: Ns Ar n +The resolver checks the modification time of +.Pa /etc/resolv.conf +every +.Ar n +seconds. +If +.Pa /etc/resolv.conf +has changed, it is automatically reloaded. +The default for +.Ar n +is two seconds. +Setting it to zero disables the file check. .El .Pp Options may also be specified as a space or tab separated list using the @@ -195,8 +208,7 @@ If more than one instance of these keywords is present, the last instance will override. .Pp The keyword and value must appear on a single line, and the keyword -(e.g.\& -.Sy nameserver ) +.Pq for example, Sy nameserver must start the line. The value follows the keyword, separated by white space. .Sh FILES diff --git a/share/man/man9/BUS_DESCRIBE_INTR.9 b/share/man/man9/BUS_DESCRIBE_INTR.9 index 038d9c6..74b2000 100644 --- a/share/man/man9/BUS_DESCRIBE_INTR.9 +++ b/share/man/man9/BUS_DESCRIBE_INTR.9 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 14, 2009 +.Dd December 9, 2015 .Dt BUS_DESCRIBE_INTR 9 .Os .Sh NAME @@ -38,7 +38,7 @@ .In sys/param.h .In sys/bus.h .Ft int -.Fo BUS_BIND_INTR +.Fo BUS_DESCRIBE_INTR .Fa "device_t dev" "device_t child" "struct resource *irq" "void *cookie" .Fa "const char *descr" .Fc |