aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_meetme.c
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-06-17 18:39:26 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-06-17 18:39:26 +0000
commitb6350c90aaa1f8c28ebcbd6b73f99d9b4de606b2 (patch)
treee1a2e0fa812ee5ed5f70a25bd167d3926732681c /apps/app_meetme.c
parent0d1992fedfcb3753fa8740ea69c470a42096d6ea (diff)
Merged revisions 324176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r324176 | lmadsen | 2011-06-17 14:38:40 -0400 (Fri, 17 Jun 2011) | 2 lines Fix typo in documentation. Pointed out by Vlad Povorozniuc ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@324177 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
-rw-r--r--apps/app_meetme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index dad293b6e..40f5b0ee4 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -371,7 +371,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</syntax>
<description>
<para>Run admin <replaceable>command</replaceable> for a specific
- <replaceable>channel</replaceable> in any coference.</para>
+ <replaceable>channel</replaceable> in any conference.</para>
</description>
</application>
<application name="SLAStation" language="en_US">