[asterisk-commits] lmadsen: branch 1.6.0 r192095 - /branches/1.6.0/apps/app_forkcdr.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon May  4 12:39:30 2009
New Revision: 192095

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192095
Log:
Commit the changes from rev 192094 in the 1.6.1 branch to the 1.6.0 branch.

Since the documentation system is different between <= 1.6.1 and >= 1.6.2
the changes to the documentation I made for issue 14801, I'm merging these
changes in manually. Additional changes will then be put into trunk and
merged down to 1.6.2 as those two versions share a similar documentation
system (XML).

(issue #14801)

Modified:
    branches/1.6.0/apps/app_forkcdr.c

Modified: branches/1.6.0/apps/app_forkcdr.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_forkcdr.c?view=diff&rev=192095&r1=192094&r2=192095
==============================================================================
--- branches/1.6.0/apps/app_forkcdr.c (original)
+++ branches/1.6.0/apps/app_forkcdr.c Mon May  4 12:39:30 2009
@@ -43,7 +43,7 @@
 static char *descrip = 
 "  ForkCDR([options]):  Causes the Call Data Record to fork an additional\n"
 "cdr record starting from the time of the fork call. This new cdr record will\n"
-"be linked to end of the list of cdr records attached to the channel. The original CDR is\n"
+"be linked to end of the list of cdr records attached to the channel. The original CDR\n"
 "has a LOCKED flag set, which forces most cdr operations to skip it, except\n"
 "for the functions that set the answer and end times, which ignore the LOCKED\n"
 "flag. This allows all the cdr records in the channel to be 'ended' together\n"
@@ -93,24 +93,24 @@
 "set. Almost all internal CDR functions (except for the funcs that set\n"
 "the end, and answer times, and set a variable) will honor this flag\n"
 "and leave a LOCKED cdr record alone.\n"
-"This means that the newly created forked cdr record will affected\n"
+"This means that the newly created forked cdr record will be affected\n"
 "by events transpiring within Asterisk, with the previously noted\n"
 "exceptions.\n"
 "  Options:\n"
-"    a - update the answer time on the NEW CDR just after it's been inited..\n"
-"         The new CDR may have been answered already, the reset that forkcdr.\n"
+"    a - update the answer time on the NEW CDR just after it's been inited.\n"
+"         The new CDR may have been answered already. The reset that forkcdr\n"
 "         does will erase the answer time. This will bring it back, but\n"
-"         the answer time will be a copy of the fork/start time. It will.\n"
-"         only do this if the initial cdr was indeed already answered..\n"
+"         the answer time will be a copy of the fork/start time. It will\n"
+"         only do this if the initial cdr was indeed already answered.\n"
 "    A - Lock the original CDR against the answer time being updated.\n"
 "         This will allow the disposition on the original CDR to remain the same.\n"
-"    d - Copy the disposition forward from the old cdr, after the .\n"
-"         init..\n"
-"    D - Clear the dstchannel on the new CDR after reset..\n"
-"    e - end the original CDR. Do this after all the necc. data.\n"
-"         is copied from the original CDR to the new forked CDR..\n"
-"    R -  do NOT reset the new cdr..\n"
-"    s(name=val) - Set the CDR var 'name' in the original CDR, with value.\n"
+"    d - Copy the disposition forward from the old cdr, after the \n"
+"         init.\n"
+"    D - Clear the dstchannel on the new CDR after reset.\n"
+"    e - end the original CDR. Do this after all the neccessary data\n"
+"         is copied from the original CDR to the new forked CDR.\n"
+"    R -  do NOT reset the new cdr.\n"
+"    s(name=val) - Set the CDR var 'name' in the original CDR, with value\n"
 "                  'val'.\n"
 "    T -  Mark the original CDR with a DONT_TOUCH flag. setvar, answer, and end\n"
 "          cdr funcs will obey this flag; normally they don't honor the LOCKED\n"