[asterisk-commits] mjordan: trunk r404051 - in /trunk: ./ LICENSE

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Dec 17 18:17:15 2013
New Revision: 404051

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404051
Log:
LICENSE: Update language to include ARI
........

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

Modified:
    trunk/   (props changed)
    trunk/LICENSE

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Dec 17 18:17:15 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048,404050

Modified: trunk/LICENSE
URL: http://svnview.digium.com/svn/asterisk/trunk/LICENSE?view=diff&rev=404051&r1=404050&r2=404051
==============================================================================
--- trunk/LICENSE (original)
+++ trunk/LICENSE Tue Dec 17 18:17:15 2013
@@ -27,15 +27,15 @@
 Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
 and/or the UW IMAP Toolkit and distribute the resulting binary files.
 
-In addition, Asterisk implements two management/control protocols: the
-Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
-(AGI). It is our belief that applications using these protocols to
-manage or control an Asterisk instance do not have to be licensed
-under the GPL or a compatible license, as we believe these protocols
-do not create a 'derivative work' as referred to in the GPL. However,
-should any court or other judiciary body find that these protocols do
-fall under the terms of the GPL, then we hereby grant you a license to
-use these protocols in combination with Asterisk in external
+In addition, Asterisk implements several management/control protocols.
+This includes the Asterisk Manager Interface (AMI), the Asterisk Gateway
+Interface (AGI), and the Asterisk REST Interface (ARI). It is our belief
+that applications using these protocols to manage or control an Asterisk
+instance do not have to be licensed under the GPL or a compatible license,
+as we believe these protocols do not create a 'derivative work' as referred
+to in the GPL. However, should any court or other judiciary body find that
+these protocols do fall under the terms of the GPL, then we hereby grant you a
+license to use these protocols in combination with Asterisk in external
 applications licensed under any license you wish.
 
 The 'Asterisk' name and logos are trademarks owned by Digium, Inc.,