aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Paillard <spaillard@debian.org>2012-11-11 12:08:29 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2012-11-11 12:08:29 +0100
commitb1171e214ecedd13cc7003d9fb97a3127df8c0ab (patch)
tree585fcad1796bdbf2827daa2fc182ac7ff0031f3d
parent4bcf05347cb29dcda3ae90cfb800cac06d952800 (diff)
downloadman-pages-b1171e214ecedd13cc7003d9fb97a3127df8c0ab.tar.gz
resolv.conf.5: Document IPv6 format for nameserver
See: http://bugs.debian.org/610036 Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man5/resolv.conf.57
1 files changed, 4 insertions, 3 deletions
diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5
index e82ea72750..9a3ca54baa 100644
--- a/man5/resolv.conf.5
+++ b/man5/resolv.conf.5
@@ -18,7 +18,7 @@
.\"
.\" Added ndots remark by Bernhard R. Link - debian bug #182886
.\"
-.TH RESOLV.CONF 5 2012-05-04 "" "Linux Programmer's Manual"
+.TH RESOLV.CONF 5 2012-11-11 "" "Linux Programmer's Manual"
.UC 4
.SH NAME
resolv.conf \- resolver configuration file
@@ -42,8 +42,9 @@ and the domain search path is constructed from the domain name.
The different configuration options are:
.TP
\fBnameserver\fP Name server IP address
-Internet address (in dot notation) of a name server
-that the resolver should query.
+Internet address of a name server that the resolver should query,
+either an IPv4 address (in dot notation),
+or an IPv6 address in colon (and possibly dot) notation as per RFC 2373.
Up to
.B MAXNS
(currently 3, see \fI<resolv.h>\fP) name servers may be listed,