[asterisk-commits] rmudgett: trunk r399258 - in /trunk: ./ include/asterisk/features_config.h

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Sep 17 12:55:21 2013
New Revision: 399258

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399258
Log:
Fix doxygen to use correct units of features.conf options.
........

Merged revisions 399257 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/features_config.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Sep 17 12:55:21 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237,399247
+/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197,399207,399225,399237,399247,399257

Modified: trunk/include/asterisk/features_config.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/features_config.h?view=diff&rev=399258&r1=399257&r2=399258
==============================================================================
--- trunk/include/asterisk/features_config.h (original)
+++ trunk/include/asterisk/features_config.h Tue Sep 17 12:55:21 2013
@@ -71,9 +71,9 @@
 	);
 	/*! Seconds allowed between digit presses when dialing transfer destination */
 	unsigned int transferdigittimeout;
-	/*! Milliseconds to wait for the transfer target to answer a transferred call */
+	/*! Seconds to wait for the transfer target to answer a transferred call */
 	unsigned int atxfernoanswertimeout;
-	/*! Milliseconds to wait before attempting to re-dial the transfer target */
+	/*! Seconds to wait before attempting to re-dial the transfer target */
 	unsigned int atxferloopdelay;
 	/*! Number of times to re-attempt dialing the transfer target */
 	unsigned int atxfercallbackretries;