From ca46ee6d2b4ab601e67a8d10accef83cfa78b9d9 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Oct 2014 08:05:21 +1100
Subject: [PATCH] 3985.   [doc]           Describe how +ndots and +search
 interact in dig.                         [RT #37529]

(cherry picked from commit 40b28f54029a5399fc17d895dd9e8bbcd97d6b70)
---
 CHANGES             |  3 +++
 bin/dig/dig.docbook | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b56133b3d8..1fce02e286 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3985.	[doc]		Describe how +ndots and +search interact in dig.
+			[RT #37529]
+
 3982.	[doc]		Include release notes in product documentation.
 			[RT #37272]
 
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 89d766b541..53ab0c6e9f 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -624,7 +624,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>
@@ -731,6 +732,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>