X-Git-Url: http://git.osdn.net/view?p=linuxjm%2FLDP_man-pages.git;a=blobdiff_plain;f=original%2Fman5%2Fresolv.conf.5;h=5aaddb3562fce67cca9c3b07a326ba89ff09b930;hp=d6e1d18a26931c19a4c4cd8c5c834533ea6c48dc;hb=4ea6bb24817f6f049d6bbc90ecd77a869876f9b0;hpb=c22bb444e1a8f4a0e08a82e80ea4ad06593869da

diff --git a/original/man5/resolv.conf.5 b/original/man5/resolv.conf.5
index d6e1d18a..5aaddb35 100644
--- a/original/man5/resolv.conf.5
+++ b/original/man5/resolv.conf.5
@@ -20,7 +20,7 @@
 .\"
 .\" Added ndots remark by Bernhard R. Link - debian bug #182886
 .\"
-.TH RESOLV.CONF 5 2014-02-22 "" "Linux Programmer's Manual"
+.TH RESOLV.CONF 5 2014-12-31 "" "Linux Programmer's Manual"
 .UC 4
 .SH NAME
 resolv.conf \- resolver configuration file
@@ -261,6 +261,17 @@ When that happens the client system will sit and wait for the second reply.
 Turning this option on changes this behavior
 so that if two requests from the same port are not handled correctly it will
 close the socket and open a new one before sending the second request.
+.TP
+.BR no-tld-query " (since glibc 2.14)"
+sets RES_NOTLDQUERY in
+.IR _res.options .
+This option causes
+.BR res_nsearch ()
+to not attempt to resolve an unqualified name
+as if it were a top level domain (TLD).
+This option can cause problems if the site has ``localhost'' as a TLD
+rather than having localhost on one or more elements of the search list.
+This option has no effect if neither RES_DEFNAMES or RES_DNSRCH is set.
 .RE
 .LP
 The \fIdomain\fP and \fIsearch\fP keywords are mutually exclusive.
@@ -295,7 +306,7 @@ in the first column are treated as comments.
 .br
 Name Server Operations Guide for BIND
 .SH COLOPHON
-This page is part of release 3.67 of the Linux
+This page is part of release 3.79 of the Linux
 .I man-pages
 project.
 A description of the project,