[asterisk-commits] rmudgett: trunk r418938 - in /trunk: ./ funcs/func_audiohookinherit.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jul 18 11:47:23 2014
New Revision: 418938

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418938
Log:
func_audiohookinherit.c: Fixup some XML documentation wording.
........

Merged revisions 418937 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/funcs/func_audiohookinherit.c

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

Modified: trunk/funcs/func_audiohookinherit.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_audiohookinherit.c?view=diff&rev=418938&r1=418937&r2=418938
==============================================================================
--- trunk/funcs/func_audiohookinherit.c (original)
+++ trunk/funcs/func_audiohookinherit.c Fri Jul 18 11:47:23 2014
@@ -47,11 +47,11 @@
 		</synopsis>
 		<description>
 			<para>Prior to Asterisk 12, masquerades would occur under all sorts of
-			situations which were hard to predict. In Asterisk 12, masquerades now only
-			occur as a result of small set of similar operations for which inheriting
-			all	audiohooks from the original channel is now safe, so in Asterisk 12.5+,
+			situations which were hard to predict.  In Asterisk 12, masquerades only
+			occur as a result of a small set of operations for which inheriting all
+			audiohooks from the original channel is now safe.  So in Asterisk 12.5+,
 			all audiohooks are inherited without needing other controls expressing
-			which audiohooks should	be inherited under which which conditions.</para>
+			which audiohooks should be inherited under which conditions.</para>
 		</description>
 	</function>
  ***/