[asterisk-commits] dlee: trunk r402741 - in /trunk: ./ res/ari/ rest-api/api-docs/

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Nov 12 09:27:00 2013
New Revision: 402741

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402741
Log:
Fixed a typ.
........

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

Modified:
    trunk/   (props changed)
    trunk/res/ari/ari_model_validators.h
    trunk/rest-api/api-docs/events.json

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Nov 12 09:27:00 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402570,402582,402584,402593,402606,402647,402687,402710
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-402738

Modified: trunk/res/ari/ari_model_validators.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/ari_model_validators.h?view=diff&rev=402741&r1=402740&r2=402741
==============================================================================
--- trunk/res/ari/ari_model_validators.h (original)
+++ trunk/res/ari/ari_model_validators.h Tue Nov 12 09:27:00 2013
@@ -919,7 +919,7 @@
 /*!
  * \brief Validator for StasisEnd.
  *
- * Notification that a channel has left a Stasis appliction.
+ * Notification that a channel has left a Stasis application.
  *
  * \param json JSON object to validate.
  * \returns True (non-zero) if valid.
@@ -937,7 +937,7 @@
 /*!
  * \brief Validator for StasisStart.
  *
- * Notification that a channel has entered a Stasis appliction.
+ * Notification that a channel has entered a Stasis application.
  *
  * \param json JSON object to validate.
  * \returns True (non-zero) if valid.

Modified: trunk/rest-api/api-docs/events.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/events.json?view=diff&rev=402741&r1=402740&r2=402741
==============================================================================
--- trunk/rest-api/api-docs/events.json (original)
+++ trunk/rest-api/api-docs/events.json Tue Nov 12 09:27:00 2013
@@ -403,7 +403,7 @@
 		},
 		"StasisEnd": {
 			"id": "StasisEnd",
-			"description": "Notification that a channel has left a Stasis appliction.",
+			"description": "Notification that a channel has left a Stasis application.",
 			"properties": {
 				"channel": {
 					"required": true,
@@ -413,7 +413,7 @@
 		},
 		"StasisStart": {
 			"id": "StasisStart",
-			"description": "Notification that a channel has entered a Stasis appliction.",
+			"description": "Notification that a channel has entered a Stasis application.",
 			"properties": {
 				"args": {
 					"required": true,