aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-04-01 17:00:01 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-04-01 17:00:01 +0000
commit1d8d739641e383a6b331a933227f191a5c7d0a40 (patch)
tree7e1a55dbcd1e1e979216d462e7f654218a1e6621 /README
parent442d3fcddf1af52e81817cfc7e173f7435dc67c0 (diff)
clarify licensing text in README
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5341 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'README')
-rwxr-xr-xREADME10
1 files changed, 6 insertions, 4 deletions
diff --git a/README b/README
index d95ce6a57..24a11f4b6 100755
--- a/README
+++ b/README
@@ -20,8 +20,10 @@ community on this Wiki:
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 @@ fall under our copyright/license umbrella, or are distributed under more
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.