Commit Graph

6 Commits

Author SHA1 Message Date
Doug Barton
3329c8935f Resolve conflicts in 8.3.6, generally in favor of the vendor code 2003-06-17 08:32:40 +00:00
Doug Barton
16f43f04f8 Resolve conflicts, generally in favor of the vendor version. 2002-07-01 01:20:28 +00:00
Jacques Vidrine
02a3169302 Resolve conflicts after import of ISC BIND 8.3.2-T1B documentation. 2002-05-13 19:35:44 +00:00
Peter Wemm
c91c657ae2 Merge changes from vendor branch onto HEAD. 1999-11-30 02:52:56 +00:00
Nik Clayton
80ea937ef4 .sp -> .Pp
"... Pa /etc/resolv.conf" -> "...\n.Pa /etc/resolv.conf"

.Po and .Pc reported as broken, replaced with "(" and ")"

PR:		docs/7819
Submitted by:	yohta@bres.tsukuba.ac.jp
1999-04-10 20:38:17 +00:00
Peter Wemm
4e0ffe0bae Import (trimmed) ISC bind-8.1.2-t3b. This will be updated to 8.1.2 on
final release.

Obtained from:  ftp.isc.org
1998-05-03 04:11:49 +00:00