[asterisk-commits] jpeeler: branch dhubbard/pinecowbell r188285 - in /team/dhubbard/pinecowbell:...

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr 14 09:51:10 2009
New Revision: 188285

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188285
Log:
sync with trunk

Modified:
    team/dhubbard/pinecowbell/   (props changed)
    team/dhubbard/pinecowbell/apps/app_jack.c
    team/dhubbard/pinecowbell/doc/manager_1_1.txt
    team/dhubbard/pinecowbell/main/xmldoc.c

Propchange: team/dhubbard/pinecowbell/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 14 09:51:10 2009
@@ -1,1 +1,1 @@
-/trunk:1-188248
+/trunk:1-188284

Modified: team/dhubbard/pinecowbell/apps/app_jack.c
URL: http://svn.digium.com/svn-view/asterisk/team/dhubbard/pinecowbell/apps/app_jack.c?view=diff&rev=188285&r1=188284&r2=188285
==============================================================================
--- team/dhubbard/pinecowbell/apps/app_jack.c (original)
+++ team/dhubbard/pinecowbell/apps/app_jack.c Tue Apr 14 09:51:10 2009
@@ -26,7 +26,7 @@
  * and output jack port so that the audio can be processed through
  * another application, or to play audio from another application.
  *
- * \arg http://www.jackaudio.org/
+ * \extref http://www.jackaudio.org/
  *
  * \note To install libresample, check it out of the following repository:
  * <code>$ svn co http://svn.digium.com/svn/thirdparty/libresample/trunk</code>

Modified: team/dhubbard/pinecowbell/doc/manager_1_1.txt
URL: http://svn.digium.com/svn-view/asterisk/team/dhubbard/pinecowbell/doc/manager_1_1.txt?view=diff&rev=188285&r1=188284&r2=188285
==============================================================================
--- team/dhubbard/pinecowbell/doc/manager_1_1.txt (original)
+++ team/dhubbard/pinecowbell/doc/manager_1_1.txt Tue Apr 14 09:51:10 2009
@@ -252,6 +252,35 @@
 		To list the information about a specific SKINNY line.
 	Variables:
 		Line: <line> Line to show information about.
+
+- Action: CoreSettings
+	Modules: manager.c
+	Purpose: To report core settings, like AMI and Asterisk version,
+		maxcalls and maxload settings.
+		* Integrated in SVN trunk as of May 4th, 2007
+	Example:
+		Response: Success
+		ActionID: 1681692777
+		AMIversion: 1.1
+		AsteriskVersion: SVN-oej-moremanager-r61756M
+		SystemName: EDVINA-node-a
+		CoreMaxCalls: 120
+		CoreMaxLoadAvg: 0.000000
+		CoreRunUser: edvina
+		CoreRunGroup: edvina
+
+- Action: CoreStatus
+	Modules: manager.c
+	Purpose: To report current PBX core status flags, like
+		number of concurrent calls, startup and reload time.
+		* Integrated in SVN trunk as of May 4th, 2007
+	Example:
+		Response: Success
+		ActionID: 1649760492
+		CoreStartupTime: 22:35:17
+		CoreReloadTime: 22:35:17
+		CoreCurrentCalls: 20
+
 		
 * NEW EVENTS
 ------------
@@ -294,34 +323,6 @@
 		SIPcallid: NTQzYWFiOWM4NmE0MWRkZjExMzU2YzQ3OWQwNzg3ZmI.
 		SIPfullcontact: sip:olle at 127.0.0.1:49054
 
-- Action: CoreSettings
-	Modules: manager.c
-	Purpose: To report core settings, like AMI and Asterisk version,
-		maxcalls and maxload settings.
-		* Integrated in SVN trunk as of May 4th, 2007
-	Example:
-		Response: Success
-		ActionID: 1681692777
-		AMIversion: 1.1
-		AsteriskVersion: SVN-oej-moremanager-r61756M
-		SystemName: EDVINA-node-a
-		CoreMaxCalls: 120
-		CoreMaxLoadAvg: 0.000000
-		CoreRunUser: edvina
-		CoreRunGroup: edvina
-
-- Action: CoreStatus
-	Modules: manager.c
-	Purpose: To report current PBX core status flags, like
-		number of concurrent calls, startup and reload time.
-		* Integrated in SVN trunk as of May 4th, 2007
-	Example:
-		Response: Success
-		ActionID: 1649760492
-		CoreStartupTime: 22:35:17
-		CoreReloadTime: 22:35:17
-		CoreCurrentCalls: 20
-
 - Event: NewAccountCode
 	Modules: cdr.c
 	Purpose: To report a change in account code for a live channel

Modified: team/dhubbard/pinecowbell/main/xmldoc.c
URL: http://svn.digium.com/svn-view/asterisk/team/dhubbard/pinecowbell/main/xmldoc.c?view=diff&rev=188285&r1=188284&r2=188285
==============================================================================
--- team/dhubbard/pinecowbell/main/xmldoc.c (original)
+++ team/dhubbard/pinecowbell/main/xmldoc.c Tue Apr 14 09:51:10 2009
@@ -19,6 +19,8 @@
  * \brief XML Documentation API
  *
  * \author Eliel C. Sardanons (LU1ALY) <eliels at gmail.com>
+ *
+ * \extref libxml2 http://www.xmlsoft.org/
  */
 
 #include "asterisk.h"