From: Leif Madsen <leif@leifmadsen.com>
Date: Fri, 17 Jun 2011 18:39:26 +0000 (+0000)
Subject: Merged revisions 324176 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5770c43f0fcf1cc3b52ddc58de91c08bcb0df30;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@324177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index dad293b6e6..40f5b0ee44 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">