From: Mark Andrews <marka@isc.org>
Date: Mon, 20 Oct 2014 21:05:21 +0000 (+1100)
Subject: 3985.   [doc]           Describe how +ndots and +search interact in dig.
X-Git-Tag: v9.11.0a1~1340
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=40b28f54029a5399fc17d895dd9e8bbcd97d6b70;p=thirdparty%2Fbind9.git

3985.   [doc]           Describe how +ndots and +search interact in dig.
                        [RT #37529]
---

diff --git a/CHANGES b/CHANGES
index 335daf5b778..ae158e6068d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3985.	[doc]		Describe how +ndots and +search interact in dig.
+			[RT #37529]
+
 3984.	[func]		Accept 256 byte long PINs in native PKCS#11
 			crypto. [RT #37410]
 
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 2726f284e1c..5dfbe212df4 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -683,7 +683,8 @@
 	      are interpreted as relative names and will be searched
 	      for in the domains listed in the <option>search</option>
 	      or <option>domain</option> directive in
-	      <filename>/etc/resolv.conf</filename>.
+	      <filename>/etc/resolv.conf</filename> if
+	      <option>+search</option> is set.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -790,6 +791,13 @@
 	      <filename>resolv.conf</filename> (if any).  The search
 	      list is not used by default.
 	    </para>
+	    <para>
+	      'ndots' from <filename>resolv.conf</filename> (default 1)
+	       which may be overridden by <parameter>+ndots</parameter>
+	      determines if the name will be treated as relative
+	      or not and hence whether a search is eventually
+	      performed or not.
+	    </para>
 	  </listitem>
 	</varlistentry>