Merged revisions 329950 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329950 | seanbright | 2011-07-28 08:43:55 -0400 (Thu, 28 Jul 2011) | 1 line

  Correct the spelling of 'conference.'
........

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

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 4897d06..76b4b26 100644 (file)
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2623,13 +2623,13 @@ static int func_confbridge_info(struct ast_channel *chan, const char *cmd, char
                return -1;
        }
        if (!ao2_container_count(conference_bridges)) {
-               ast_log(LOG_ERROR, "No active conferneces.\n");
+               ast_log(LOG_ERROR, "No active conferences.\n");
                return -1;
        }
        ast_copy_string(tmp.name, args.confno, sizeof(tmp.name));
        bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
        if (!bridge) {
-               ast_log(LOG_ERROR, "Confernece '%s' not found.\n", args.confno);
+               ast_log(LOG_ERROR, "Conference '%s' not found.\n", args.confno);
                return -1;
        }