Merge "Fix Common Typo's."

include/asterisk.h

@@ -223,7 +223,7 @@ struct ast_json;
 
 #elif defined(AST_MODULE_SELF_SYM)
 
-/*! Retreive the 'struct ast_module *' for the current module. */
+/*! Retrieve the 'struct ast_module *' for the current module. */
 #define AST_MODULE_SELF AST_MODULE_SELF_SYM()
 
 struct ast_module;

include/asterisk/ast_version.h

@@ -41,7 +41,7 @@ const char *ast_get_version(void);
  */
 const char *ast_get_version_num(void);
 
-/*! Retreive the Asterisk build options */
+/*! Retrieve the Asterisk build options */
 const char *ast_get_build_opts(void);
 
 #endif /* __AST_VERSION_H */

include/asterisk/astobj2.h

@@ -145,7 +145,7 @@ An interface to help debug refcounting is provided
 in this package. It is dependent on the refdebug being enabled in
 asterisk.conf.
 
-Each of the reference manipulations will generate one line of output in in the refs
+Each of the reference manipulations will generate one line of output in the refs
 log file. These lines look like this:
 ...
 0x8756f00,+1,1234,chan_sip.c,22240,load_module,**constructor**,allocate users
@@ -682,7 +682,7 @@ int ao2_weakproxy_unsubscribe(void *weakproxy, ao2_weakproxy_notification_cb cb,
  * \since 14.0.0
  * \brief Get the weakproxy attached to obj
  *
- * \param obj The object to retreive a weakproxy from
+ * \param obj The object to retrieve a weakproxy from
  *
  * \return The weakproxy object
  */
@@ -1057,7 +1057,7 @@ enum search_flags {
 	OBJ_NODATA = (1 << 1),
 	/*!
 	 * Don't stop at the first match in ao2_callback() unless the
-	 * result of of the callback function has the CMP_STOP bit set.
+	 * result of the callback function has the CMP_STOP bit set.
 	 */
 	OBJ_MULTIPLE = (1 << 2),
 	/*!

include/asterisk/bridge_after.h

@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-/*! Reason the the after bridge callback will not be called. */
+/*! Reason the after bridge callback will not be called. */
 enum ast_bridge_after_cb_reason {
 	/*! The datastore is being destroyed.  Likely due to hangup. (Enum value must be zero.) */
 	AST_BRIDGE_AFTER_CB_REASON_DESTROY,

include/asterisk/bridge_features.h

@@ -721,7 +721,7 @@ int ast_bridge_features_limits_construct(struct ast_bridge_features_limits *limi
  * \param limits pointer to an ast_bridge_features_limits struct that needs to be destroyed
  *
  * This function does not free memory allocated to the ast_bridge_features_limits struct, it only frees elements within the struct.
- * You must still call ast_free on the the struct if you allocated it with malloc.
+ * You must still call ast_free on the struct if you allocated it with malloc.
  */
 void ast_bridge_features_limits_destroy(struct ast_bridge_features_limits *limits);
 

include/asterisk/callerid.h

@@ -240,7 +240,7 @@ void ast_shrink_phone_number(char *n);
 int ast_isphonenumber(const char *n);
 
 /*!
- * \brief Check if a string consists only of digits and and + \# ( ) - .
+ * \brief Check if a string consists only of digits and + \# ( ) - .
  * (meaning it can be cleaned with ast_shrink_phone_number)
  * \param exten The extension (or URI) to be checked.
  * \retval 1 if string is valid AST shrinkable phone number

include/asterisk/http.h

@@ -316,7 +316,7 @@ int ast_http_response_status_line(const char *buf, const char *version, int code
  * \param name out parameter pointing to the header name
  * \param value out parameter pointing to header value
  * \return -1 if buf is empty
- * \return 0 if buf could be separated into into name and value
+ * \return 0 if buf could be separated into name and value
  * \return 1 if name or value portion don't exist
  * \since 13
  */

include/asterisk/parking.h

@@ -164,7 +164,7 @@ struct ast_parking_bridge_feature_fn_table {
 	 * \param parker The \ref bridge_channel object that is initiating the parking
 	 * \param context The context to blind transfer to
 	 * \param exten The extension to blind transfer to
-	 * \param parked_channel_cb Execute the following function on the the channel that gets parked
+	 * \param parked_channel_cb Execute the following function on the channel that gets parked
 	 * \param parked_channel_data Data for the parked_channel_cb
 	 *
 	 * \note If the bridge \ref parker is in has more than one other occupant, the entire
@@ -236,7 +236,7 @@ int ast_parking_park_call(struct ast_bridge_channel *parker, char *exten, size_t
  * \param context The context to blind transfer to
  * \param exten The extension to blind transfer to
  * \param exten The extension to blind transfer to
- * \param parked_channel_cb Execute the following function on the the channel that gets parked
+ * \param parked_channel_cb Execute the following function on the channel that gets parked
  * \param parked_channel_data Data for the parked_channel_cb
  *
  * \note If the bridge \ref parker is in has more than one other occupant, the entire

include/asterisk/pbx.h

@@ -1108,7 +1108,7 @@ int ast_rdlock_context(struct ast_context *con);
 int ast_unlock_context(struct ast_context *con);
 
 /*!
- * \brief locks the macrolock in the given given context
+ * \brief locks the macrolock in the given context
  *
  * \param macrocontext name of the macro-context to lock
  *

include/asterisk/strings.h

@@ -256,7 +256,7 @@ enum ast_strsep_flags {
 
 /*!
   \brief Act like strsep but ignore separators inside quotes.
-  \param s Pointer to address of the the string to be processed.
+  \param s Pointer to address of the string to be processed.
   Will be modified and can't be constant.
   \param sep A single character delimiter.
   \param flags Controls post-processing of the result.