Module Name:	basesrc
Committed By:	itojun
Date:		Thu Jun 20 12:01:50 UTC 2002

Modified Files:
	basesrc/dist/bind/bin/named: ns_glue.c
	basesrc/dist/bind/man: dig.1 host.1 named.8 named.conf.5 nslookup.8

Log Message:
correct conflicts.
sync document with reality (dig/host/nslookup now does IPv6 transport!)


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 basesrc/dist/bind/bin/named/ns_glue.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/bind/man/dig.1
cvs rdiff -r1.8 -r1.9 basesrc/dist/bind/man/host.1
cvs rdiff -r1.10 -r1.11 basesrc/dist/bind/man/named.8
cvs rdiff -r1.6 -r1.7 basesrc/dist/bind/man/named.conf.5 \
    basesrc/dist/bind/man/nslookup.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.