aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-30 18:51:15 +0000
committerdbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-30 18:51:15 +0000
commit30b87c0062b1d65f0d48ff085377c4959af606fc (patch)
tree8b37c823f2e15449bf337a053ea73995f61bd923
parent02bea3bae42a3838064bbf481306bc33eb6c2f54 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@209594 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_forkcdr.c2
-rw-r--r--apps/app_sms.c2
-rw-r--r--channels/chan_console.c2
-rw-r--r--channels/chan_dahdi.c4
-rw-r--r--codecs/lpc10/pitsyn.c2
-rwxr-xr-xcontrib/init.d/rc.debian.asterisk2
-rw-r--r--include/asterisk/abstract_jb.h4
7 files changed, 9 insertions, 9 deletions
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 341e52a8d..76af0a2ae 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -64,7 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
reset.</para>
</option>
<option name="e">
- <para>End the original CDR. Do this after all the neccessry data is copied
+ <para>End the original CDR. Do this after all the necessary data is copied
from the original CDR to the new forked CDR.</para>
</option>
<option name="r">
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 0015cc842..9dec33b4a 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -1779,7 +1779,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 ee26f2195..0dec71e66 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -1379,7 +1379,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 e43576e38..5f7d78562 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -983,7 +983,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];
@@ -6456,7 +6456,7 @@ winkflashdone:
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 ea8177e22..36f6f2a7a 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 74cdeffe0..889bd1eaa 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 <ibc@in.ilimit.es>
# - 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 <damin@nacs.net>
diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h
index d884ce3d5..2a1b89fd1 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.