Merged revisions 311874 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311874 | rmudgett | 2011-03-29 20:56:05 -0500 (Tue, 29 Mar 2011) | 1 line
  
  Update some setup_dahdi_int() comments.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

@@ -17824,7 +17824,8 @@ static void deep_copy_dahdi_chan_conf(struct dahdi_chan_conf *dest, const struct
  * \brief Setup DAHDI channel driver.
  *
  * \param reload enum: load_module(0), reload(1), restart(2).
- * \param base_conf Default config parameters.  So cc_params can be properly destroyed.
+ * \param default_conf Default config parameters.  So cc_params can be properly destroyed.
+ * \param base_conf Default config parameters per section.  So cc_params can be properly destroyed.
  * \param conf Local config parameters.  So cc_params can be properly destroyed.
  *
  * \retval 0 on success.
@@ -17988,7 +17989,7 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *default_conf, str
 	if (ucfg) {
 		const char *chans;
 
-		/* Reset base_conf, so things dont leak from dahdi_chan.conf */
+		/* Reset base_conf, so things don't leak from dahdi_chan.conf */
 		deep_copy_dahdi_chan_conf(base_conf, default_conf);
 		process_dahdi(base_conf, "", ast_variable_browse(ucfg, "general"), 1, 0);