From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 2 Mar 2010 19:09:20 +0000 (+0000)
Subject: Merged revisions 249892 via svnmerge from
X-Git-Tag: 1.6.2.6-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2ffe96f7697d1ac0e3064a97e1ddab2b95a2397;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@249894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index d52d3449d8..0fd473e9c2 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -97,7 +97,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                 <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>
 ***/