From: David Brooks Date: Thu, 30 Jul 2009 18:46:07 +0000 (+0000) Subject: Merged revisions 209554 via svnmerge from X-Git-Tag: 1.6.1.5-rc1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058028d79bded06b779984443fdbb7299e59d9f2;p=thirdparty%2Fasterisk.git Merged revisions 209554 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r209554 | dbrooks | 2009-07-30 11:07:05 -0500 (Thu, 30 Jul 2009) | 6 lines Fixes numerous spelling errors. Patch submitted by alecdavis. (closes issue #15595) Reported by: alecdavis ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209593 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_sms.c b/apps/app_sms.c index 6c99ad37aa..1a66a12f87 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -1757,7 +1757,7 @@ static void sms_process(sms_t * h, int samples, signed short *data) h->iphasep = 0; } if (bit && h->ibitc == 200) { /* sync, restart message */ - /* Protocol 2: empty connnection ready (I am master) */ + /* Protocol 2: empty connection ready (I am master) */ if (h->framenumber < 0 && h->ibytec >= 160 && !memcmp(h->imsg, "UUUUUUUUUUUUUUUUUUUU", 20)) { h->framenumber = 1; ast_verb(3, "SMS protocol 2 detected\n"); diff --git a/channels/chan_console.c b/channels/chan_console.c index 131a3d7dbd..3e326632a1 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -1381,7 +1381,7 @@ static void destroy_pvts(void) /*! * \brief Load the configuration * \param reload if this was called due to a reload - * \retval 0 succcess + * \retval 0 success * \retval -1 failure */ static int load_config(int reload) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 635a2acd69..c0cf77e662 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -842,7 +842,7 @@ static struct dahdi_pvt { */ char mohinterpret[MAX_MUSICCLASS]; /*! - * \brief Sugggested music-on-hold class for peer channel to use for calls. + * \brief Suggested music-on-hold class for peer channel to use for calls. * \note The "mohsuggest" string read in from chan_dahdi.conf */ char mohsuggest[MAX_MUSICCLASS]; @@ -5414,7 +5414,7 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast) p->dop.dialstr[0] = '\0'; break; default: - ast_log(LOG_WARNING, "Don't know how to handle ring/off hoook for signalling %d\n", p->sig); + ast_log(LOG_WARNING, "Don't know how to handle ring/off hook for signalling %d\n", p->sig); } break; case DAHDI_EVENT_HOOKCOMPLETE: diff --git a/codecs/lpc10/pitsyn.c b/codecs/lpc10/pitsyn.c index ea8177e223..36f6f2a7af 100644 --- a/codecs/lpc10/pitsyn.c +++ b/codecs/lpc10/pitsyn.c @@ -73,7 +73,7 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re * Initial revision * */ /* Revision 1.2 1996/03/25 18:49:07 jaf */ -/* Added commments about which indices of array arguments are read or */ +/* Added comments about which indices of array arguments are read or */ /* written. */ /* Rearranged local variable declarations to indicate which need to be */ diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index 015f2db300..2a64428526 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -4,7 +4,7 @@ # Mon Jun 04 2007 Iñaki Baz Castillo # - Eliminated SAFE_ASTERISK since it doesn't work as LSB script (it could require a independent "safe_asterisk" init script). # - Load and use the standar "/lib/lsb/init-functions". -# - Addded "--oknodo" to "start-stop-daemon" for compatibility with LSB: +# - Added "--oknodo" to "start-stop-daemon" for compatibility with LSB: # http://www.linux-foundation.org/spec/refspecs/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html # # Thu Nov 17 2005 Gregory Boehnlein diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h index d884ce3d54..2a1b89fd18 100644 --- a/include/asterisk/abstract_jb.h +++ b/include/asterisk/abstract_jb.h @@ -183,8 +183,8 @@ void ast_jb_destroy(struct ast_channel *chan); * \param varname property name. * \param value property value. * - * Called from a channel driver to build a jitterbuffer configuration tipically when - * reading a configuration file. It is not neccessary for a channel driver to know + * Called from a channel driver to build a jitterbuffer configuration typically when + * reading a configuration file. It is not necessary for a channel driver to know * each of the jb configuration property names. The jitterbuffer itself knows them. * The channel driver can pass each config var it reads through this function. It will * return 0 if the variable was consumed from the jb conf.