From: Evan Hunt <each@isc.org>
Date: Mon, 3 Mar 2014 18:05:55 +0000 (-0800)
Subject: [master] revert the "version" interactive command from nslookup
X-Git-Tag: v9.10.0b2~64
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9f5222620cd3b68f88a5d8cc01b194ea4abb0754;p=thirdparty%2Fbind9.git

[master] revert the "version" interactive command from nslookup
---

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 78239cdb7d8..21929ba610c 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -754,8 +754,6 @@ do_next_command(char *input) {
 		show_settings(ISC_TRUE, ISC_TRUE);
 	} else if (strcasecmp(ptr, "exit") == 0) {
 		in_use = ISC_FALSE;
-	} else if (strcasecmp(ptr, "version") == 0) {
-		version();
 	} else if (strcasecmp(ptr, "help") == 0 ||
 		   strcasecmp(ptr, "?") == 0) {
 		printf("The '%s' command is not yet implemented.\n", ptr);
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 88d3d6a2e59..022de672b80 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -133,6 +133,11 @@ nslookup -query=hinfo  -timeout=10
 </programlisting>
       <!-- </informalexample> -->
     </para>
+    <para>
+      The <option>-version</option> option causes
+      <command>nslookup</command> to print the version
+      number and immediately exits.
+    </para>
 
   </refsect1>
 
@@ -230,18 +235,6 @@ nslookup -query=hinfo  -timeout=10
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><constant>version</constant></term>
-        <listitem>
-          <para>
-            Prints the version number. (This can also be
-	    done from the command line by using
-	    <option>-version</option>, which will print
-	    the version number and immediately exit.)
-          </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><constant>exit</constant></term>
         <listitem>