diff options
| author | Leif Madsen <leif@leifmadsen.com> | 2011-06-17 15:32:08 +0000 |
|---|---|---|
| committer | Leif Madsen <leif@leifmadsen.com> | 2011-06-17 15:32:08 +0000 |
| commit | 71e4b2a5d1e5830117760367c745bcde8164498c (patch) | |
| tree | 5e9a2b44ad2b073404768f2024557fc15fc37091 /main | |
| parent | 34e2305ae7c6aabdd27ddc454db9449c07845ee1 (diff) | |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index b9c853505..60de17f89 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -252,7 +252,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <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 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") 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 |