diff options
author | dougb <dougb@FreeBSD.org> | 2003-06-17 08:32:40 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2003-06-17 08:32:40 +0000 |
commit | e754b647b9c039dcb7874e0bc76513b94a09973a (patch) | |
tree | 1f846ff595677c5a2a5fd161e1c788bcbf0d1581 /contrib/bind/doc | |
parent | d4a040827d377a4fc59a22c8840bc7f2b57f7977 (diff) | |
download | FreeBSD-src-e754b647b9c039dcb7874e0bc76513b94a09973a.zip FreeBSD-src-e754b647b9c039dcb7874e0bc76513b94a09973a.tar.gz |
Resolve conflicts in 8.3.6, generally in favor of the vendor code
Diffstat (limited to 'contrib/bind/doc')
-rw-r--r-- | contrib/bind/doc/man/dig.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bind/doc/man/dig.1 b/contrib/bind/doc/man/dig.1 index e150b04..829a585 100644 --- a/contrib/bind/doc/man/dig.1 +++ b/contrib/bind/doc/man/dig.1 @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.\" $Id: dig.1,v 8.9 2002/06/18 01:53:43 marka Exp $ +.\" $Id: dig.1,v 8.11 2003/04/03 05:52:34 marka Exp $ .\" .\" ++Copyright++ 1993 .\" - @@ -246,7 +246,7 @@ one can simply .It Fl x Ar IPv6-address Convenient form to specify inverse address mapping. Instead of -.Dq Ic dig 1.0.0.0.0.0.0.0.0.0.0.0. 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa , +.Dq Ic dig 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa , one can simply .Dq Ic dig -x ::1 . .It Fl f Ar file @@ -685,7 +685,7 @@ authored by Andrew Cherenson. .Sh BUGS .Ic Dig has a serious case of "creeping featurism" -- the result of -considering several potential uses during it's development. It would +considering several potential uses during its development. It would probably benefit from a rigorous diet. Similarly, the print flags and granularity of the items they specify make evident their rather ad hoc genesis. |