Merge branch 'upstream' into tizen

Conflicts:
	ares_set_local_dev.3
	ares_set_servers_csv.3

Change-Id: I1da63c678df60657e903fd4917f07784bd37ce94

diff --cc ares_set_servers_csv.3
index a37c437,5c16efb..c2f5062
--- 1/ares_set_servers_csv.3
--- 2/ares_set_servers_csv.3
+++ b/ares_set_servers_csv.3
@@@ -20,24 -20,45 +20,58 @@@ ares_set_servers_csv, ares_set_servers_
  .nf
  .B #include <ares.h>
  .PP
 +.B void ares_set_servers_csv(ares_channel \fIchannel\fP, const char* \fIservers\fP)
 +.fi
 +.SH DESCRIPTION
 +The \fBares_set_servers_csv\fP function sets the list of DNS servers
 +that ARES will query.  The format of the servers option is:
+ .B int ares_set_servers_csv(ares_channel \fIchannel\fP, const char* \fIservers\fP)
+ .B int ares_set_servers_ports_csv(ares_channel \fIchannel\fP, const char* \fIservers\fP)
+ .fi
+ .SH DESCRIPTION
+ The \fBares_set_servers_csv\fP and \fBares_set_servers_ports_csv\fPfunctions set
+ the list of DNS servers that ARES will query.  The format of the servers option is:
  
  host[:port][,host[:port]]...
  
  For example:
  
  192.168.1.100,192.168.1.101,3.4.5.6
 +
 +.SH SEE ALSO
 +.BR ares_set_servers (3)
 +.SH NOTES
 +The port option is currently ignored by c-ares internals
 +and the standard port is always used.
 +
 +This function was added in c-ares 1.7.2
+ .PP
+ The \fBares_set_servers_csv\fP function will ignore any port values specified in
+ the input string, whereare the \fBares_set_servers_ports_csv\fP function will
+ apply any specified port values as the UDP and TCP port to be used for that
+ particular nameserver.
+ 
+ .SH RETURN VALUES
+ .B ares_set_servers_csv(3)
+ This function may return any of the following values:
+ .TP 15
+ .B ARES_SUCCESS
+ The name servers configuration was successfuly initialized.
+ .TP 15
+ .B ARES_ENOMEM
+ The process's available memory was exhausted.
+ .TP 15
+ .B ARES_ENODATA
+ The channel data identified by
+ .IR channel
+ was invalid.
+ .TP 15
+ .B ARES_ENOTINITIALIZED
+ c-ares library initialization not yet performed.
+ .SH SEE ALSO
+ .BR ares_set_servers (3)
+ .SH AVAILABILITY
+ \fBares_set_servers_csv\fP was added in c-ares 1.7.2;
+ \fBares_set_servers_ports_csv\fP was added in c-ares 1.11.0.
  .SH AUTHOR
  Ben Greear