summaryrefslogtreecommitdiff
path: root/share/man/man5
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2010-04-15 09:52:59 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2010-04-15 09:52:59 +0000
commit89707408d6a128ac4b58a85616eb150918dedfcd (patch)
treeeb4523c10f8040305d38dccd846b029949cf5edc /share/man/man5
parent63d7be1d8c75efdff08a1e0019a38b658bdfad88 (diff)
tweaked diff from Nathan Rickerby to clear up the [host]:port ip6 syntax;
kind of fixes system/6322 ok deraadt djm
Diffstat (limited to 'share/man/man5')
-rw-r--r--share/man/man5/resolv.conf.513
1 files changed, 10 insertions, 3 deletions
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index f955d89c647..c3d083e03d1 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: resolv.conf.5,v 1.33 2009/11/20 14:43:43 ajacoutot Exp $
+.\" $OpenBSD: resolv.conf.5,v 1.34 2010/04/15 09:52:58 jmc Exp $
.\" $NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
.\"
.\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
.\"
.\" @(#)resolver.5 5.12 (Berkeley) 5/10/91
.\"
-.Dd $Mdocdate: November 20 2009 $
+.Dd $Mdocdate: April 15 2010 $
.Dt RESOLV.CONF 5
.Os
.Sh NAME
@@ -110,8 +110,15 @@ Scoped IPv6 address notation is accepted as well
.Xr inet6 4
for details).
A non-standard port may be specified using
-.Ar [host]:port
+.Bo Ar host Bc : Ns Ar port
syntax.
+When a non-standard port is specified the host
+address must be enclosed in square brackets.
+For example:
+.Bd -literal -offset indent
+nameserver [10.0.0.1]:5353
+nameserver [::1]:5353
+.Ed
.Pp
Up to
.Dv MAXNS