[asterisk-commits] rmudgett: trunk r321518 - in /trunk: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue May 31 15:55:06 2011
New Revision: 321518

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321518
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/acl.h
    trunk/include/asterisk/dnsmgr.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/acl.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/acl.h?view=diff&rev=321518&r1=321517&r2=321518
==============================================================================
--- trunk/include/asterisk/acl.h (original)
+++ trunk/include/asterisk/acl.h Tue May 31 15:55:06 2011
@@ -143,7 +143,7 @@
  * 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

Modified: trunk/include/asterisk/dnsmgr.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/dnsmgr.h?view=diff&rev=321518&r1=321517&r2=321518
==============================================================================
--- trunk/include/asterisk/dnsmgr.h (original)
+++ trunk/include/asterisk/dnsmgr.h Tue May 31 15:55:06 2011
@@ -68,11 +68,13 @@
  * \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.