summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2011-05-31 20:55:06 +0000
committerRichard Mudgett <rmudgett@digium.com>2011-05-31 20:55:06 +0000
commit17b852183684947d82e4980d3b710dc7177e7b42 (patch)
treeb1011e99a67befe648c7a082a1a499d11e05e083
parent3588746c75a6b2977ed900ef7f85728d24e01e76 (diff)
Merged revisions 321517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r321517 | rmudgett | 2011-05-31 15:54:35 -0500 (Tue, 31 May 2011) | 1 line Update some comments. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--include/asterisk/acl.h2
-rw-r--r--include/asterisk/dnsmgr.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h
index 86053f431..973a3d0c2 100644
--- a/include/asterisk/acl.h
+++ b/include/asterisk/acl.h
@@ -143,7 +143,7 @@ int ast_get_ip(struct ast_sockaddr *addr, const char *value);
* then this function acts exactly like a call to ast_get_ip.
*
* \param addr The IP address found. The address family is used as an input parameter to
- * filter the returned adresses. if it is 0, both IPv4 and IPv6 addresses
+ * filter the returned addresses. if it is 0, both IPv4 and IPv6 addresses
* can be returned.
*
* \param value The hostname to look up
diff --git a/include/asterisk/dnsmgr.h b/include/asterisk/dnsmgr.h
index 2c96d8e40..da8303064 100644
--- a/include/asterisk/dnsmgr.h
+++ b/include/asterisk/dnsmgr.h
@@ -68,11 +68,13 @@ void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry);
* \brief Allocate and initialize a DNS manager entry
*
* \param name the hostname
- * \param result where to store the IP address as the DNS manager refreshes it. The address family
- * is used as an input parameter to filter the returned adresses. if it is 0, both IPv4 * and IPv6 addresses can be returned.
+ * \param result where to store the IP address as the DNS manager refreshes it.
+ * The address family is used as an input parameter to filter the returned addresses.
+ * If it is 0, both IPv4 and IPv6 addresses can be returned.
* \param dnsmgr Where to store the allocate DNS manager entry
* \param service
*
+ * \note
* This function allocates a new DNS manager entry object, and fills it with
* the provided hostname and IP address. This function _does_ force an initial
* lookup, so it may block for some period of time.