aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:09:20 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:09:20 +0000
commitb6399a2c6032038eaf5afb2af4bc57d24917741c (patch)
tree7bb33e8919b2a0746d994dcfa0f068001f1e5b77 /apps
parent0bcb9706a461050ed509639d8d73eb3b5fc8fdf5 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@249894 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_confbridge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index d52d3449d..0fd473e9c 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>
***/