[asterisk-commits] pabelanger: branch 10 r341665 - in /branches/10: ./ funcs/func_callerid.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Thu Oct 20 15:47:39 2011
New Revision: 341665

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

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

Modified:
    branches/10/   (props changed)
    branches/10/funcs/func_callerid.c

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

Modified: branches/10/funcs/func_callerid.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/funcs/func_callerid.c?view=diff&rev=341665&r1=341664&r2=341665
==============================================================================
--- branches/10/funcs/func_callerid.c (original)
+++ branches/10/funcs/func_callerid.c Thu Oct 20 15:47:39 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>