[svn-commits] pabelanger: trunk r341666 - in /trunk: ./ funcs/func_callerid.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Oct 20 15:48:31 2011
New Revision: 341666

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341666
Log:
Updated documentation for the optional CID parameter with CALLERID
........

Merged revisions 341664 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 341665 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/funcs/func_callerid.c

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

Modified: trunk/funcs/func_callerid.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_callerid.c?view=diff&rev=341666&r1=341665&r2=341666
==============================================================================
--- trunk/funcs/func_callerid.c (original)
+++ trunk/funcs/func_callerid.c Thu Oct 20 15:48:31 2011
@@ -120,7 +120,8 @@
 				</enumlist>
 			</parameter>
 			<parameter name="CID">
-				<para>Optional Caller*ID</para>
+				<para>Optional Caller*ID to parse instead of using the Caller*ID from the
+				channel. This paramater is only optional when reading the Caller*ID.</para>
 			</parameter>
 		</syntax>
 		<description>