[Asterisk-cvs] asterisk README,1.31,1.32

kpfleming at lists.digium.com kpfleming at lists.digium.com
Fri Apr 1 11:06:39 CST 2005


Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv601

Modified Files:
	README 
Log Message:
clarify licensing text in README


Index: README
===================================================================
RCS file: /usr/cvsroot/asterisk/README,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- README	1 Apr 2005 04:38:12 -0000	1.31
+++ README	1 Apr 2005 17:00:01 -0000	1.32
@@ -20,8 +20,10 @@
            http://www.voip-info.org/wiki-Asterisk
 
 * LICENSING
-  Asterisk is distributed under GNU General Public License.  The GPL also
-must apply to all loadable modules as well, except as defined below.
+  Asterisk is distributed under GNU General Public License and is also
+available under alternative licenses negotiated directly with Digium, Inc.
+If you obtained Asterisk under the GPL, then the GPL applies to all
+loadable modules used on your system as well, except as defined below.
 
   Digium, Inc. (formerly Linux Support Services) retains copyright and/or a
 sufficient license to all components of the core Asterisk system, and therefore
@@ -32,9 +34,9 @@
 flexible licenses than GPL.  
 
   If you wish to use our code in other GPL programs, don't worry -- there
-is no requirement that you provide the same exemption in your GPL'd
+is no requirement that you provide the same exception in your GPL'd
 products (although if you've written a module for Asterisk we would
-strongly encourage you to make the same exemption that we do).
+strongly encourage you to make the same exception that we do).
 
   Specific permission is also granted to OpenSSL and OpenH323 to link with
 Asterisk.




More information about the svn-commits mailing list