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