[asterisk-commits] lmadsen: trunk r324131 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Fri Jun 17 10:32:08 2011
New Revision: 324131

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

........
  r324115 | lmadsen | 2011-06-17 11:14:54 -0400 (Fri, 17 Jun 2011) | 3 lines
  
  Fix grammar in documentation for Goto() and GotoIf()
  (closes issue ASTERISK-18023)
  Reported by: Tim Osman
........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

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

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=324131&r1=324130&r2=324131
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Jun 17 10:32:08 2011
@@ -252,7 +252,7 @@
 			<para>If the location that is put into the channel information is bogus, and asterisk cannot
 			find that location in the dialplan, then the execution engine will try to find and execute the code in
 			the <literal>i</literal> (invalid) extension in the current context. If that does not exist, it will try to execute the
-			<literal>h</literal> extension. If either or neither the <literal>h</literal> or <literal>i</literal> extensions
+			<literal>h</literal> extension. If neither the <literal>h</literal> nor <literal>i</literal> extensions
 			have been defined, the channel is hung up, and the execution of instructions on the channel is terminated.
 			What this means is that, for example, you specify a context that does not exist, then
 			it will not be possible to find the <literal>h</literal> or <literal>i</literal> extensions,
@@ -289,7 +289,7 @@
 			next instruction. If the target location is bogus, and does not exist, the execution engine will try
 			to find and execute the code in the <literal>i</literal> (invalid) extension in the current context.
 			If that does not exist, it will try to execute the <literal>h</literal> extension.
-			If either or neither the <literal>h</literal> or <literal>i</literal> extensions have been defined,
+			If neither the <literal>h</literal> nor <literal>i</literal> extensions have been defined,
 			the channel is hung up, and the execution of instructions on the channel is terminated.
 			Remember that this command can set the current context, and if the context specified
 			does not exist, then it will not be able to find any 'h' or 'i' extensions there, and