<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17108">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: preceded<br><br>Change-Id: I372359acfdbe7e28adcb66ffd2ce2ef7cd72c6c8<br>---<br>M apps/app_audiosocket.c<br>M apps/app_echo.c<br>M apps/app_mixmonitor.c<br>M apps/app_morsecode.c<br>M apps/app_mp3.c<br>M apps/app_queue.c<br>M apps/app_saycounted.c<br>M contrib/scripts/ast_loggrabber<br>M include/asterisk/callerid.h<br>M main/manager.c<br>M main/say.c<br>M res/res_musiconhold.c<br>12 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/08/17108/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_audiosocket.c b/apps/app_audiosocket.c</span><br><span>index a8dbcdb..a9de60d 100644</span><br><span>--- a/apps/app_audiosocket.c</span><br><span>+++ b/apps/app_audiosocket.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span> <description></span><br><span> <para>Connects to the given TCP service, then transmits channel audio over that socket. In turn, audio is received from the socket and sent to the channel. Only audio frames will be transmitted.</para></span><br><span> <para>Protocol is specified at https://wiki.asterisk.org/wiki/display/AST/AudioSocket</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should generally be preceeded by an application such as Answer() or Progress().</para></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should generally be preceded by an application such as Answer() or Progress().</para></span><br><span> </description></span><br><span> </application></span><br><span> ***/</span><br><span>diff --git a/apps/app_echo.c b/apps/app_echo.c</span><br><span>index b70ab36..c8da98c 100644</span><br><span>--- a/apps/app_echo.c</span><br><span>+++ b/apps/app_echo.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> channel back to itself. This will not echo CONTROL, MODEM, or NULL</span><br><span> frames. Note: If '#' detected application exits.</para></span><br><span> <para>This application does not automatically answer and should be</span><br><span style="color: hsl(0, 100%, 40%);">- preceeded by an application such as Answer() or Progress().</para></span><br><span style="color: hsl(120, 100%, 40%);">+ preceded by an application such as Answer() or Progress().</para></span><br><span> </description></span><br><span> </application></span><br><span> ***/</span><br><span>diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c</span><br><span>index 374c567..fdf1234 100644</span><br><span>--- a/apps/app_mixmonitor.c</span><br><span>+++ b/apps/app_mixmonitor.c</span><br><span>@@ -153,7 +153,7 @@</span><br><span> </syntax></span><br><span> <description></span><br><span> <para>Records the audio on the current channel to the specified file.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should be preceeded by</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should be preceded by</span><br><span> an application such as Answer or Progress().</para></span><br><span> <note><para>MixMonitor runs as an audiohook.</para></note></span><br><span> <note><para>If a filename passed to MixMonitor ends with</span><br><span>diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c</span><br><span>index 995eb70..0970fac 100644</span><br><span>--- a/apps/app_morsecode.c</span><br><span>+++ b/apps/app_morsecode.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> </syntax></span><br><span> <description></span><br><span> <para>Plays the Morse code equivalent of the passed string.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should be preceeded by</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should be preceded by</span><br><span> an application such as Answer() or Progress().</para></span><br><span> <para>This application uses the following variables:</para></span><br><span> <variablelist></span><br><span>diff --git a/apps/app_mp3.c b/apps/app_mp3.c</span><br><span>index 8422240..a369656 100644</span><br><span>--- a/apps/app_mp3.c</span><br><span>+++ b/apps/app_mp3.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span> to see how M3U playlist file format is like, Example usage would be</span><br><span> exten => 1234,1,MP3Player(/var/lib/asterisk/playlist.m3u)</span><br><span> User can exit by pressing any key on the dialpad, or by hanging up.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should be preceeded by an</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should be preceded by an</span><br><span> application such as Answer() or Progress().</para></span><br><span> </description></span><br><span> </application></span><br><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index ff6ad76..32a5f79 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -277,7 +277,7 @@</span><br><span> up by another user.</para></span><br><span> <para>This application will return to the dialplan if the queue does not exist, or</span><br><span> any of the join options cause the caller to not enter the queue.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should be preceeded</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should be preceded</span><br><span> by an application such as Answer(), Progress(), or Ringing().</para></span><br><span> <para>This application sets the following channel variables upon completion:</para></span><br><span> <variablelist></span><br><span>diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c</span><br><span>index 0e0f2e0..8e4283e 100644</span><br><span>--- a/apps/app_saycounted.c</span><br><span>+++ b/apps/app_saycounted.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> implement complicated spelling rules. We simply record the word</span><br><span> "men" in the sound file named "mans".</para></span><br><span> <para>This application does not automatically answer and should be</span><br><span style="color: hsl(0, 100%, 40%);">- preceeded by an application such as Answer() or Progress.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ preceded by an application such as Answer() or Progress.</para></span><br><span> </description></span><br><span> <see-also></span><br><span> <ref type="application">SayCountedAdj</ref></span><br><span>@@ -102,7 +102,7 @@</span><br><span> SayCountedAdj(5,new,f) will play sound file "newx" (containing the</span><br><span> word "novikh").</para></span><br><span> <para>This application does not automatically answer and should be</span><br><span style="color: hsl(0, 100%, 40%);">- preceeded by an application such as Answer(), Progress(), or</span><br><span style="color: hsl(120, 100%, 40%);">+ preceded by an application such as Answer(), Progress(), or</span><br><span> Proceeding().</para></span><br><span> </description></span><br><span> <see-also></span><br><span>diff --git a/contrib/scripts/ast_loggrabber b/contrib/scripts/ast_loggrabber</span><br><span>index cb22dd4..9906a48 100755</span><br><span>--- a/contrib/scripts/ast_loggrabber</span><br><span>+++ b/contrib/scripts/ast_loggrabber</span><br><span>@@ -231,7 +231,7 @@</span><br><span> args=parser.parse_args()</span><br><span> </span><br><span> # We only convert timestamps that are at the beginning of a line</span><br><span style="color: hsl(0, 100%, 40%);">-# or are preceeded by a whilespace character or a '['</span><br><span style="color: hsl(120, 100%, 40%);">+# or are preceded by a whilespace character or a '['</span><br><span> rets = re.compile(r'(^|(?<=\s|\[))\d+(\.\d+)?', flags=re.M)</span><br><span> if args.timezone and len(args.timezone) > 0:</span><br><span> tzf = tz.tzfile('/usr/share/zoneinfo/' + args.timezone)</span><br><span>diff --git a/include/asterisk/callerid.h b/include/asterisk/callerid.h</span><br><span>index ac49b35..777553d 100644</span><br><span>--- a/include/asterisk/callerid.h</span><br><span>+++ b/include/asterisk/callerid.h</span><br><span>@@ -218,7 +218,7 @@</span><br><span> /*!</span><br><span> * \brief Generate a CAS (CPE Alert Signal) tone for 'n' samples</span><br><span> * \param outbuf Allocated buffer for data. Must be at least 2400 bytes unless no SAS is desired</span><br><span style="color: hsl(0, 100%, 40%);">- * \param sas Non-zero if CAS should be preceeded by SAS</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param sas Non-zero if CAS should be preceded by SAS</span><br><span> * \param len How many samples to generate.</span><br><span> * \param codec Which codec (AST_FORMAT_ALAW or AST_FORMAT_ULAW)</span><br><span> * \return Returns -1 on error (if len is less than 2400), 0 on success.</span><br><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index 90a4f8b..bc52c2d 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -1261,7 +1261,7 @@</span><br><span> <para>This filter option is used to whitelist or blacklist events per user to be</span><br><span> reported with regular expressions and are allowed if both the regex matches</span><br><span> and the user has read access as defined in manager.conf. Filters are assumed to be for whitelisting</span><br><span style="color: hsl(0, 100%, 40%);">- unless preceeded by an exclamation point, which marks it as being black.</span><br><span style="color: hsl(120, 100%, 40%);">+ unless preceded by an exclamation point, which marks it as being black.</span><br><span> Evaluation of the filters is as follows:</para></span><br><span> <para>- If no filters are configured all events are reported as normal.</para></span><br><span> <para>- If there are white filters only: implied black all filter processed first, then white filters.</para></span><br><span>diff --git a/main/say.c b/main/say.c</span><br><span>index 2862799..cb30921 100644</span><br><span>--- a/main/say.c</span><br><span>+++ b/main/say.c</span><br><span>@@ -5132,7 +5132,7 @@</span><br><span> }</span><br><span> break;</span><br><span> case 'H':</span><br><span style="color: hsl(0, 100%, 40%);">- /* 24-Hour, single digit hours preceeded by "oh" (0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 24-Hour, single digit hours preceded by "oh" (0) */</span><br><span> if (tm.tm_hour < 10 && tm.tm_hour > 0) {</span><br><span> res = wait_file(chan, ints, "digits/0", lang);</span><br><span> }</span><br><span>diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c</span><br><span>index e982c97..ea25190 100644</span><br><span>--- a/res/res_musiconhold.c</span><br><span>+++ b/res/res_musiconhold.c</span><br><span>@@ -92,7 +92,7 @@</span><br><span> Set(CHANNEL(musicclass)=...). If duration is given, hold music will be played</span><br><span> specified number of seconds. If duration is omitted, music plays indefinitely.</span><br><span> Returns <literal>0</literal> when done, <literal>-1</literal> on hangup.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <para>This application does not automatically answer and should be preceeded by</span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This application does not automatically answer and should be preceded by</span><br><span> an application such as Answer() or Progress().</para></span><br><span> </description></span><br><span> </application></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17108">change 17108</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17108"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I372359acfdbe7e28adcb66ffd2ce2ef7cd72c6c8 </div>
<div style="display:none"> Gerrit-Change-Number: 17108 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>