[asterisk-commits] rmudgett: trunk r339513 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Oct  5 12:02:17 2011
New Revision: 339513

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339513
Log:
Merged revisions 339512 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339512 | rmudgett | 2011-10-05 12:01:46 -0500 (Wed, 05 Oct 2011) | 9 lines
  
  Merged revisions 339511 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339511 | rmudgett | 2011-10-05 12:01:01 -0500 (Wed, 05 Oct 2011) | 1 line
    
    Fix Dial F option notes formatting.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

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

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=339513&r1=339512&r2=339513
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Oct  5 12:02:17 2011
@@ -165,7 +165,9 @@
 					<note>
 						<para>Any channel variables you want the called channel to inherit from the caller channel must be
 						prefixed with one or two underbars ('_').</para>
-						<para>Additionally, using this option from a Macro() or GoSub() might not make sense as there would be no return points</para>
+					</note>
+					<note>
+						<para>Using this option from a Macro() or GoSub() might not make sense as there would be no return points.</para>
 					</note>
 				</option>
 				<option name="g">