[svn-commits] mmichelson: branch 1.6.0 r124279 - in /branches/1.6.0: ./ include/asterisk/ m...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 20 11:31:26 2008
New Revision: 124279

URL: http://svn.digium.com/view/asterisk?view=rev&rev=124279
Log:
Merged revisions 124278 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r124278 | mmichelson | 2008-06-20 11:30:18 -0500 (Fri, 20 Jun 2008) | 6 lines

Change references to doc/channelvariables.txt to
doc/tex/channelvariables.tex.

This issue came up on the asterisk-dev mailing list.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/doxyref.h
    branches/1.6.0/main/ast_expr2.fl
    branches/1.6.0/main/ast_expr2f.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/doxyref.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/doxyref.h?view=diff&rev=124279&r1=124278&r2=124279
==============================================================================
--- branches/1.6.0/include/asterisk/doxyref.h (original)
+++ branches/1.6.0/include/asterisk/doxyref.h Fri Jun 20 11:31:26 2008
@@ -153,7 +153,7 @@
  * - \ref pbx_retrieve_variable()
  * - \ref AstChanVar
  *
- *  \verbinclude channelvariables.txt
+ *  \verbinclude channelvariables.tex
 
  */
 

Modified: branches/1.6.0/main/ast_expr2.fl
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/ast_expr2.fl?view=diff&rev=124279&r1=124278&r2=124279
==============================================================================
--- branches/1.6.0/main/ast_expr2.fl (original)
+++ branches/1.6.0/main/ast_expr2.fl Fri Jun 20 11:31:26 2008
@@ -437,7 +437,7 @@
 			(extra_error_message_supplied?extra_error_message:""), s2, parseio->string,spacebuf2);
 #endif
 #ifndef STANDALONE
-	ast_log(LOG_WARNING,"If you have questions, please refer to doc/channelvariables.txt in the asterisk source.\n");
+	ast_log(LOG_WARNING,"If you have questions, please refer to doc/tex/channelvariables.tex in the asterisk source.\n");
 #endif
 	free(s2);
 	return(0);

Modified: branches/1.6.0/main/ast_expr2f.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/ast_expr2f.c?view=diff&rev=124279&r1=124278&r2=124279
==============================================================================
--- branches/1.6.0/main/ast_expr2f.c (original)
+++ branches/1.6.0/main/ast_expr2f.c Fri Jun 20 11:31:26 2008
@@ -2531,7 +2531,7 @@
 			(extra_error_message_supplied?extra_error_message:""), s2, parseio->string,spacebuf2);
 #endif
 #ifndef STANDALONE
-	ast_log(LOG_WARNING,"If you have questions, please refer to doc/channelvariables.txt in the asterisk source.\n");
+	ast_log(LOG_WARNING,"If you have questions, please refer to doc/tex/channelvariables.tex in the asterisk source.\n");
 #endif
 	free(s2);
 	return(0);