Index: include/asterisk/app.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/app.h,v
retrieving revision 1.45
diff -u -r1.45 app.h
--- include/asterisk/app.h	8 Nov 2005 03:41:10 -0000	1.45
+++ include/asterisk/app.h	10 Nov 2005 18:24:39 -0000
@@ -190,13 +190,13 @@
   \param arglist The list of arguments, defined using AST_APP_ARG
 
   This macro defines a structure intended to be used in a call
-  to ast_separate_app_args(). The structure includes all the
+  to ast_app_separate_args(). The structure includes all the
   arguments specified, plus an argv array that overlays them and an
   argc argument counter. The arguments must be declared using AST_APP_ARG,
   and they will all be character pointers (strings).
 
   \note The structure is <b>not</b> initialized, as the call to
-  ast_separate_app_args() will perform that function before parsing
+  ast_app_separate_args() will perform that function before parsing
   the arguments.
  */
 #define AST_DECLARE_APP_ARGS(name, arglist) \
Index: apps/app_skel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v
retrieving revision 1.19
diff -u -r1.19 app_skel.c
--- apps/app_skel.c	8 Nov 2005 19:47:56 -0000	1.19
+++ apps/app_skel.c	10 Nov 2005 18:24:39 -0000
@@ -93,7 +93,7 @@
 		return -1;
 	}
 	
-	if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
+	if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
 		dummy = argv[0];
 		options = argv[1];
 		ast_parseoptions(app_opts, &flags, opts, options);
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.82
diff -u -r1.82 ChangeLog
--- ChangeLog	9 Nov 2005 21:48:59 -0000	1.82
+++ ChangeLog	10 Nov 2005 18:24:39 -0000
@@ -177,7 +177,7 @@
 	* include/asterisk/channel.h: add parent_channel field
 	* channel.c (__ast_request_and_dial): use parent_channel field to inherit variables into new channel
 
-	* apps/app_cut.c (cut_internal): use ast_separate_app_args() instead of open code (issue #5560)
+	* apps/app_cut.c (cut_internal): use ast_app_separate_args() instead of open code (issue #5560)
 
 	* apps/app_mixmonitor.c (launch_monitor_thread): ast_strlen_zero can handle NULL input (issue #5561)
 	(mixmonitor_exec): same
Index: doc/CODING-GUIDELINES
===================================================================
RCS file: /usr/cvsroot/asterisk/doc/CODING-GUIDELINES,v
retrieving revision 1.18
diff -u -r1.18 CODING-GUIDELINES
--- doc/CODING-GUIDELINES	31 Oct 2005 22:47:58 -0000	1.18
+++ doc/CODING-GUIDELINES	10 Nov 2005 18:24:39 -0000
@@ -295,7 +295,7 @@
 
 
 - Separating arguments to dialplan applications and functions
-Use ast_separate_app_args() to separate the arguments to your application
+Use ast_app_separate_args() to separate the arguments to your application
 once you have made a local copy of the string.
 
 - Parsing strings with strsep