From: Automerge script <automerge@asterisk.org>
Date: Thu, 9 Aug 2012 18:23:52 +0000 (+0000)
Subject: Merged revisions 370986,370989 via svnmerge from
X-Git-Tag: 10.9.0-digiumphones-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a5d5f51059db485a834d061fc3ea0df4d6c3c1;p=thirdparty%2Fasterisk.git

Merged revisions 370986,370989 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r370986 | kmoore | 2012-08-09 12:39:52 -0500 (Thu, 09 Aug 2012) | 11 lines

  Correct documentation for the MeetMe x flag

  The documentation for the x flag for MeetMe incorrectly described its
  function as closing down the conference when the last marked user left.
  It actually causes the users with that flag to leave the conference
  when the last marked user exits. The functionality of this flag is not
  changing.
  ........

  Merged revisions 370985 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r370989 | may | 2012-08-09 13:05:34 -0500 (Thu, 09 Aug 2012) | 5 lines

  change opening h323 logfile with append mode instead of overwrite
  ........

  Merged revisions 370988 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


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

diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c
index 1d5d9579ed..5f45f2473d 100644
--- a/addons/ooh323c/src/ooh323ep.c
+++ b/addons/ooh323c/src/ooh323ep.c
@@ -56,7 +56,7 @@ int ooH323EpInitialize
       strcpy(gH323ep.traceFile, DEFAULT_TRACEFILE);      
    }
 
-   gH323ep.fptraceFile = fopen(gH323ep.traceFile, "w");
+   gH323ep.fptraceFile = fopen(gH323ep.traceFile, "a");
    if(gH323ep.fptraceFile == NULL)
    {
       printf("Error:Failed to open trace file %s for write.\n", 
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f2a6463d73..4ba43ca783 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -186,7 +186,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 						<argument name="secs" required="true" />
 					</option>
 					<option name="x">
-						<para>Close the conference when last marked user exits</para>
+						<para>Leave the conference when the last marked user leaves.</para>
 					</option>
 					<option name="X">
 						<para>Allow user to exit the conference by entering a valid single digit
@@ -595,7 +595,7 @@ enum {
 	CONFFLAG_AGI = (1 << 7),
 	/*! Set to have music on hold when user is alone in conference */
 	CONFFLAG_MOH = (1 << 8),
-	/*! If set the MeetMe will return if all marked with this flag left */
+	/*! If set, the channel will leave the conference if all marked users leave */
 	CONFFLAG_MARKEDEXIT = (1 << 9),
 	/*! If set, the MeetMe will wait until a marked user enters */
 	CONFFLAG_WAITMARKED = (1 << 10),