<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17081">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: overridden<br><br>Change-Id: I15e861027fdcd80bfec7a7722f8bce720b997145<br>---<br>M CHANGES<br>M UPGRADE.txt<br>M configs/samples/cdr_tds.conf.sample<br>M configs/samples/cel_tds.conf.sample<br>M configs/samples/pjsip.conf.sample<br>M res/res_calendar_caldav.c<br>M res/res_calendar_icalendar.c<br>M res/res_pjsip_messaging.c<br>8 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/81/17081/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CHANGES b/CHANGES</span><br><span>index cbceb72..d5dc76c 100644</span><br><span>--- a/CHANGES</span><br><span>+++ b/CHANGES</span><br><span>@@ -1551,7 +1551,7 @@</span><br><span> </span><br><span> app_voicemail</span><br><span> ------------------</span><br><span style="color: hsl(0, 100%, 40%);">- * The 'Comedian Mail' prompts can now be overriden using the 'vm-login' and</span><br><span style="color: hsl(120, 100%, 40%);">+ * The 'Comedian Mail' prompts can now be overridden using the 'vm-login' and</span><br><span> 'vm-newuser' configuration options in voicemail.conf.</span><br><span> </span><br><span> * Added 'fromstring' field to the voicemail boxes. If set, it will override</span><br><span>@@ -2506,7 +2506,7 @@</span><br><span> ------------------</span><br><span> * A new configuration section - ice_host_candidates - has been added to</span><br><span> rtp.conf, allowing automatically discovered ICE host candidates to be</span><br><span style="color: hsl(0, 100%, 40%);">- overriden. This allows an Asterisk server behind a 1:1 NAT to send its</span><br><span style="color: hsl(120, 100%, 40%);">+ overridden. This allows an Asterisk server behind a 1:1 NAT to send its</span><br><span> external IP as a host candidate rather than relying on STUN to discover it.</span><br><span> </span><br><span> ------------------------------------------------------------------------------</span><br><span>@@ -4192,7 +4192,7 @@</span><br><span> the Local channel. This affects the 'LocalBridge', 'LocalOptimizationBegin',</span><br><span> and 'LocalOptimizationEnd' events.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- * The option 'allowmultiplelogin' can now be set or overriden in a particular</span><br><span style="color: hsl(120, 100%, 40%);">+ * The option 'allowmultiplelogin' can now be set or overridden in a particular</span><br><span> account. When set in the general context, it will act as the default</span><br><span> setting for defined accounts.</span><br><span> </span><br><span>@@ -4852,7 +4852,7 @@</span><br><span> * Added menu action admin_toggle_mute_participants. This will mute / unmute</span><br><span> all non-admin participants on a conference. The confbridge configuration</span><br><span> file also allows for the default sounds played to all conference users when</span><br><span style="color: hsl(0, 100%, 40%);">- this occurs to be overriden using sound_participants_unmuted and</span><br><span style="color: hsl(120, 100%, 40%);">+ this occurs to be overridden using sound_participants_unmuted and</span><br><span> sound_participants_muted.</span><br><span> </span><br><span> * Added menu action participant_count. This will playback the number of</span><br><span>@@ -4969,7 +4969,7 @@</span><br><span> * Addition of the VM_INFO function - see Function changes.</span><br><span> </span><br><span> * The imapserver, imapport, and imapflags configuration options can now be</span><br><span style="color: hsl(0, 100%, 40%);">- overriden on a user by user basis.</span><br><span style="color: hsl(120, 100%, 40%);">+ overridden on a user by user basis.</span><br><span> </span><br><span> * When voicemail plays a message's envelope with saycid set to yes, when</span><br><span> reaching the caller id field it will play a recording of a file with the same</span><br><span>@@ -5073,7 +5073,7 @@</span><br><span> chan_ooh323</span><br><span> ------------------</span><br><span> * Added NAT support for RTP. Setting in config is 'nat', which can be set</span><br><span style="color: hsl(0, 100%, 40%);">- globally and overriden on a peer by peer basis.</span><br><span style="color: hsl(120, 100%, 40%);">+ globally and overridden on a peer by peer basis.</span><br><span> </span><br><span> * Direct media functionality has been added. Options in config are:</span><br><span> directmedia (directrtp) and directrtpsetup (earlydirect)</span><br><span>diff --git a/UPGRADE.txt b/UPGRADE.txt</span><br><span>index ee75644..f128214 100644</span><br><span>--- a/UPGRADE.txt</span><br><span>+++ b/UPGRADE.txt</span><br><span>@@ -1344,7 +1344,7 @@</span><br><span> returning RESULT_SUCCESS even if there was an error.</span><br><span> </span><br><span> From 11.4 to 11.5:</span><br><span style="color: hsl(0, 100%, 40%);">-* The default settings for chan_sip are now overriden properly by the general</span><br><span style="color: hsl(120, 100%, 40%);">+* The default settings for chan_sip are now overridden properly by the general</span><br><span> settings in sip.conf. Please look over your settings upon upgrading.</span><br><span> </span><br><span> From 11.3 to 11.4:</span><br><span>diff --git a/configs/samples/cdr_tds.conf.sample b/configs/samples/cdr_tds.conf.sample</span><br><span>index f3a9d7c..0345341 100644</span><br><span>--- a/configs/samples/cdr_tds.conf.sample</span><br><span>+++ b/configs/samples/cdr_tds.conf.sample</span><br><span>@@ -48,7 +48,7 @@</span><br><span> ;</span><br><span> ; The 'language' keyword changes the language which are used for error and</span><br><span> ; information messages returned by SQL Server. Each database and user has their</span><br><span style="color: hsl(0, 100%, 40%);">-; own default value, and this default can be overriden here.</span><br><span style="color: hsl(120, 100%, 40%);">+; own default value, and this default can be overridden here.</span><br><span> ;</span><br><span> ; Accepted value: Any language installed on the target SQL Server.</span><br><span> ; Default value: us_english</span><br><span>@@ -59,7 +59,7 @@</span><br><span> ;</span><br><span> ; The 'charset' setting is used to change the character set used when connecting</span><br><span> ; to the database server. Each database and database user has their own</span><br><span style="color: hsl(0, 100%, 40%);">-; character set setting, and this default can be overriden here.</span><br><span style="color: hsl(120, 100%, 40%);">+; character set setting, and this default can be overridden here.</span><br><span> ;</span><br><span> ; Accepted value: Any valid character set available on the target SQL server.</span><br><span> ; Default value: iso_1</span><br><span>diff --git a/configs/samples/cel_tds.conf.sample b/configs/samples/cel_tds.conf.sample</span><br><span>index 399093b..d3de0e1 100644</span><br><span>--- a/configs/samples/cel_tds.conf.sample</span><br><span>+++ b/configs/samples/cel_tds.conf.sample</span><br><span>@@ -50,7 +50,7 @@</span><br><span> ;</span><br><span> ; The 'language' keyword changes the language which are used for error and</span><br><span> ; information messages returned by SQL Server. Each database and user has their</span><br><span style="color: hsl(0, 100%, 40%);">-; own default value, and this default can be overriden here.</span><br><span style="color: hsl(120, 100%, 40%);">+; own default value, and this default can be overridden here.</span><br><span> ;</span><br><span> ; Accepted value: Any language installed on the target SQL Server.</span><br><span> ; Default value: Server default</span><br><span>@@ -61,7 +61,7 @@</span><br><span> ;</span><br><span> ; The 'charset' setting is used to change the character set used when connecting</span><br><span> ; to the database server. Each database and database user has their own</span><br><span style="color: hsl(0, 100%, 40%);">-; character set setting, and this default can be overriden here.</span><br><span style="color: hsl(120, 100%, 40%);">+; character set setting, and this default can be overridden here.</span><br><span> ;</span><br><span> ; Accepted value: Any valid character set available on the target server.</span><br><span> ; Default value: Server setting</span><br><span>diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample</span><br><span>index 3ac174e..4a0ef8f 100644</span><br><span>--- a/configs/samples/pjsip.conf.sample</span><br><span>+++ b/configs/samples/pjsip.conf.sample</span><br><span>@@ -589,7 +589,7 @@</span><br><span> ;PROFILE=someprofile ;added by defaults</span><br><span> ;SERVER=myserver.example.com ;added by defaults</span><br><span> ;SERVER_PORT=5060 ;added by defaults</span><br><span style="color: hsl(0, 100%, 40%);">-;MYVAR=someUSERvalue ;added by defaults but overdidden by user</span><br><span style="color: hsl(120, 100%, 40%);">+;MYVAR=someUSERvalue ;added by defaults but overridden by user</span><br><span> ;CALLERID=8005551212 ;automatically added by 1000 callerid</span><br><span> ;DISPLAY_NAME=My Name ;automatically added by 1000 callerid</span><br><span> ;TIMEZONE=America/Denver ;added by defaults</span><br><span>diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c</span><br><span>index 9713e9b..495ac90 100644</span><br><span>--- a/res/res_calendar_caldav.c</span><br><span>+++ b/res/res_calendar_caldav.c</span><br><span>@@ -430,7 +430,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Only set values for alarm based on VALARM. Can be overriden in main/calendar.c by autoreminder</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only set values for alarm based on VALARM. Can be overridden in main/calendar.c by autoreminder</span><br><span> * therefore, go ahead and add events even if their is no VALARM or it is malformed</span><br><span> * Currently we are only getting the first VALARM and are handling repitition in main/calendar.c from calendar.conf */</span><br><span> if (!(valarm = icalcomponent_get_first_component(comp, ICAL_VALARM_COMPONENT))) {</span><br><span>diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c</span><br><span>index 76ccd91..3057ea4 100644</span><br><span>--- a/res/res_calendar_icalendar.c</span><br><span>+++ b/res/res_calendar_icalendar.c</span><br><span>@@ -306,7 +306,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Only set values for alarm based on VALARM. Can be overriden in main/calendar.c by autoreminder</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only set values for alarm based on VALARM. Can be overridden in main/calendar.c by autoreminder</span><br><span> * therefore, go ahead and add events even if their is no VALARM or it is malformed</span><br><span> * Currently we are only getting the first VALARM and are handling repitition in main/calendar.c from calendar.conf */</span><br><span> if (!(valarm = icalcomponent_get_first_component(comp, ICAL_VALARM_COMPONENT))) {</span><br><span>diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c</span><br><span>index 571a7c9..de467da 100644</span><br><span>--- a/res/res_pjsip_messaging.c</span><br><span>+++ b/res/res_pjsip_messaging.c</span><br><span>@@ -846,7 +846,7 @@</span><br><span> * \internal</span><br><span> * \brief Checks if the given msg var name should be blocked.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \details Some headers are not allowed to be overriden by the user.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \details Some headers are not allowed to be overridden by the user.</span><br><span> * Determine if the given var header name from the user is blocked for</span><br><span> * an outgoing MESSAGE.</span><br><span> *</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17081">change 17081</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/+/17081"/><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: I15e861027fdcd80bfec7a7722f8bce720b997145 </div>
<div style="display:none"> Gerrit-Change-Number: 17081 </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>