[svn-commits] qwell: trunk r2461 - in /trunk: ./ ztmonitor.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Apr 27 14:09:05 2007
New Revision: 2461

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2461
Log:
Merged revisions 2460 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2460 | qwell | 2007-04-27 14:06:12 -0500 (Fri, 27 Apr 2007) | 10 lines

Merged revisions 2459 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2459 | qwell | 2007-04-27 14:05:25 -0500 (Fri, 27 Apr 2007) | 2 lines

Correct and remove (one of each) broken syntax examples.

........

................

Modified:
    trunk/   (props changed)
    trunk/ztmonitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/trunk/ztmonitor.c?view=diff&rev=2461&r1=2460&r2=2461
==============================================================================
--- trunk/ztmonitor.c (original)
+++ trunk/ztmonitor.c Fri Apr 27 14:09:05 2007
@@ -298,10 +298,8 @@
 		"        " PROG " 1 -v -r streamrx.raw -t streamtx.raw\n"
 		"Play a combined rx/tx stream via OSS and save it to a file\n"
 		"        " PROG " 1 -o -f stream.raw\n"
-		"Play a combined rx/tx stream via OSS and save them to separate files\n"
-		"        " PROG " 1 -m -o -r streamrx.raw -t streamtx.raw\n"
 		"Save a combined normal rx/tx stream and a combined 'preecho' rx/tx stream to files\n"
-		"        " PROG " 1 -m -p -f stream.raw -F streampreecho.raw\n"
+		"        " PROG " 1 -p -f stream.raw -F streampreecho.raw\n"
 		"Save a normal rx/tx stream and a 'preecho' rx/tx stream to separate files\n"
 		"        " PROG " 1 -m -p -r streamrx.raw -t streamtx.raw -R streampreechorx.raw -T streampreechotx.raw\n"
 		"");