[asterisk-commits] lmadsen: branch 1.6.2 r249894 - in /branches/1.6.2: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Mar  2 13:09:20 2010
New Revision: 249894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249894
Log:
Merged revisions 249892 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r249892 | lmadsen | 2010-03-02 14:02:56 -0500 (Tue, 02 Mar 2010) | 1 line
  
  Fix several XML documentation validate errors.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_confbridge.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_confbridge.c?view=diff&rev=249894&r1=249893&r2=249894
==============================================================================
--- branches/1.6.2/apps/app_confbridge.c (original)
+++ branches/1.6.2/apps/app_confbridge.c Tue Mar  2 13:09:20 2010
@@ -97,7 +97,7 @@
                 <description>
                         <para>Enters the user into a specified conference bridge. The user can exit the conference by hangup only.</para>
                         <para>The join sound can be set using the <literal>CONFBRIDGE_JOIN_SOUND</literal> variable and the leave sound can be set using the <literal>CONFBRIDGE_LEAVE_SOUND</literal> variable. These can be unique to the caller.</para>
-			<note>This application will not automatically answer the channel.</note>
+			<note><para>This application will not automatically answer the channel.</para></note>
                 </description>
         </application>
 ***/