From a83d892bb2fa304bc9f2d76e9853b6941fd1177d Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Thu, 25 Mar 2010 12:48:39 +0100 Subject: [PATCH] Fix a couple of typos and grammar nits. --- CHANGES | 2 +- README | 2 +- adig.c | 4 ++-- ares_get_servers.3 | 2 +- ares_init.3 | 4 ++-- ares_process.c | 2 +- ares_save_options.3 | 6 +++--- ares_set_servers.3 | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index b6c608da..0d395807 100644 --- a/CHANGES +++ b/CHANGES @@ -27,7 +27,7 @@ Version 1.7.1 (Mar 23, 2010) functions do not support IPv6 name servers. This implies that if the user is capable of defining or providing an IPv6 name server, and the app is using ares_init_options() or ares_save_options() at some point to handle - the name servers, the app will likely loose IPv6 name servers. + the name servers, the app will likely lose IPv6 name servers. * January 28, 2010 (Daniel Stenberg) - Tommie Gannert pointed out a silly bug in ares_process_fd() since it didn't diff --git a/README b/README index aae99cdf..56a43c53 100644 --- a/README +++ b/README @@ -44,7 +44,7 @@ The following notes apply to c-ares version 1.7.0 and later. * If you intend to distribute an already compiled c-ares library you _MUST_ also distribute along with it the generated ares_build.h which has been used to compile it. Otherwise the library will be of no use for the users of - the library that you have built. It is _your_ responsability to provide this + the library that you have built. It is _your_ responsibility to provide this file. No one at the c-ares project can know how you have built the library. * File ares_build.h includes platform and configuration dependent info, diff --git a/adig.c b/adig.c index 4e33f6c0..a4dc76ec 100644 --- a/adig.c +++ b/adig.c @@ -229,7 +229,7 @@ int main(int argc, char **argv) break; case 's': - /* User specified name servers override default ones. */ + /* User-specified name servers override default ones. */ srvr = malloc(sizeof(struct ares_addr_node)); if (!srvr) { @@ -276,7 +276,7 @@ int main(int argc, char **argv) * When alternative name servers have been specified these are set * later calling ares_set_servers() overriding any existing server * configuration. To prevent initial configuration with default - * servers that will be discarded later ARES_OPT_SERVERS is set. + * servers that will be discarded later, ARES_OPT_SERVERS is set. * If this flag is not set here the result shall be the same but * ares_init_options() will do needless work. */ optmask |= ARES_OPT_SERVERS; diff --git a/ares_get_servers.3 b/ares_get_servers.3 index 78fa7bc9..7b144f04 100644 --- a/ares_get_servers.3 +++ b/ares_get_servers.3 @@ -69,7 +69,7 @@ was invalid. ares_get_servers(3) was added in c-ares 1.7.1 .SH AUTHOR Implementation of this function and associated library internals are based -on code, comments and feedback provided November and December of 2008 by +on code, comments and feedback provided in November and December of 2008 by Daniel Stenberg, Gregor Jasny, Phil Blundell and Yang Tse, December 2009 by Cedric Bail, February 2010 by Jakub Hrozek. On March 2010 Yang Tse shuffled all the bits and this function popped out. diff --git a/ares_init.3 b/ares_init.3 index e2406515..e9edad4f 100644 --- a/ares_init.3 +++ b/ares_init.3 @@ -95,9 +95,9 @@ service port. .br The list of IPv4 servers to contact, instead of the servers specified in resolv.conf or the local named. In order to allow specification of either -IPv4 or IPv6 name servers, function +IPv4 or IPv6 name servers, the .BR ares_set_servers(3) -must be used instead. +function must be used instead. .TP 18 .B ARES_OPT_DOMAINS .B char **\fIdomains\fP; diff --git a/ares_process.c b/ares_process.c index ab0b79dc..89da38f8 100644 --- a/ares_process.c +++ b/ares_process.c @@ -948,7 +948,7 @@ static int open_tcp_socket(ares_channel channel, struct server_state *server) * Disable the Nagle algorithm (only relevant for TCP sockets, and thus not * in configure_socket). In general, in DNS lookups we're pretty much * interested in firing off a single request and then waiting for a reply, - * so batching isn't very interesting in general. + * so batching isn't very interesting. */ opt = 1; if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, diff --git a/ares_save_options.3 b/ares_save_options.3 index 0dd4b4ec..54250c03 100644 --- a/ares_save_options.3 +++ b/ares_save_options.3 @@ -58,9 +58,9 @@ this config struct, which may no longer be the complete set of config options. \fBares_dup(3)\fP will not have that restriction. The ares_options struct can not handle potential IPv6 name servers the -ares_channel might be configured to use. Function \fBares_save_options(3)\fP -will only return IPv4 servers if any. In order to retrieve all name servers -an ares_channel might be using, function \fBares_get_servers(3)\fP must be +ares_channel might be configured to use. The \fBares_save_options(3)\fP function +will only return IPv4 servers, if any. In order to retrieve all name servers +an ares_channel might be using, the \fBares_get_servers(3)\fP function must be used instead. .SH SEE ALSO .BR ares_destroy_options (3), diff --git a/ares_set_servers.3 b/ares_set_servers.3 index 949b81fb..2c1b9dba 100644 --- a/ares_set_servers.3 +++ b/ares_set_servers.3 @@ -43,7 +43,7 @@ with more than one name server all the desired ones must be specified in a single list. \fBares_set_servers(3)\fP does not take ownership of the linked list argument. -The caller is responsible to free the linked list when no longer needed. +The caller is responsible for freeing the linked list when no longer needed. This function is capable of handling IPv4 and IPv6 name server addresses simultaneously, rendering \fBares_init_options(3)\fP with @@ -75,7 +75,7 @@ c-ares library initialization not yet performed. ares_set_servers(3) was added in c-ares 1.7.1 .SH AUTHOR Implementation of this function and associated library internals are based -on code, comments and feedback provided November and December of 2008 by +on code, comments and feedback provided in November and December of 2008 by Daniel Stenberg, Gregor Jasny, Phil Blundell and Yang Tse, December 2009 by Cedric Bail, February 2010 by Jakub Hrozek. On March 2010 Yang Tse shuffled all the bits and this function popped out.