README updates and license updates for header files

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4481 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 18 insertions, 16 deletions

diff --git a/README b/README
index df8079a..b2c2da5 100644
--- a/README
+++ b/README
@@ -68,7 +68,7 @@ run:
 
 Kernel Source / "Headers"
 ~~~~~~~~~~~~~~~~~~~~~~~~~
-- Building zaptel requires a kernel build tree.
+- Building Zaptel requires a kernel build tree.
 - This should basically be at least a partial kernel source tree and
   most importantly, the exact kernel .config file used for the build as
   well as several files generated at kernel build time.
@@ -104,13 +104,13 @@ If you build a custom kernel, note the following configuration items:
 - CONFIG_CRC_CCITT must be enabled ('y' or 'm'). On 2.6 kernels this can 
   be selected These can be selected from the "Library Routines" submenu 
   during kernel configuration via "make menuconfig".
-- If you don't have any zaptel hardware, you need ztdummy. ztdummy takes
+- If you don't have any Zaptel hardware, you need ztdummy. ztdummy takes
   its timing from the kernel. It can use either of the following:
-  * ztdummy on i386/x86_64 with kernels >= 2.6.22 can (and should) use 
-    high resolution times (CONFIG_HIGH_RES_TIMERS), and (if available, 
+  * ztdummy on i386/x86_64 with kernels >= 2.6.22 can (and should) use
+    high resolution timers (CONFIG_HIGH_RES_TIMERS), and (if available),
     the system HPET. This shows as "source: HRTimer". This is
     recommended.
-  * ztdummy on i386/x86_64 and later kernels (>= 2.6.15) can use the 
+  * ztdummy on i386/x86_64 with kernels >= 2.6.15 can use the 
     system's RTC (Real Time Clock). This shows as "source: RTC".
   * Failing that, on Linux 2.6 kernels with HZ=1000 (was the default
     before 2.6.13). This shows as "source: Linux26".
@@ -120,7 +120,7 @@ If you build a custom kernel, note the following configuration items:
     possible on 2.4). This shows as: "source: UHCI".
 
 
-A Build System
+Build System
 ~~~~~~~~~~~~~~
 gcc and friends. Generally you will need to install the package gcc.
 There may be cases where you will need a specific version of gcc to build
@@ -272,7 +272,7 @@ itself, but , rather, edit live/live.conf . Please let me know if you
 needed to change anything in the script beyond changing live.conf so I
 can include useful fixes.
 
-Testing on a different maching:
+Testing on a different machine:
 
   ./configure
   make
@@ -704,21 +704,23 @@ that is included in the ppp/ subdirectory. To install it:
    CONFIG_HDLC .
 
 
-What is the license for the zaptel driver?
-------------------------------------------
-libpri is distributed under the terms of the GNU General Public License, 
-which permit its use and linking with other GPL'd software only.  
-The GNU GPL is included in the file LICENSE in this directory.
+License
+-------
+This package is distributed under the terms of the GNU General Public License
+Version 2, except for some components which are distributed under the terms of
+the GNU Lesser General Public License Version 2.1. Both licenses are included
+in this directory, and each file is clearly marked as to which license applies.
 
-If you wish to use the zaptel drivers in an application for which the 
-GPL is not appropriate (e.g. a proprietary embedded system), licenses
-under more flexible terms can be readily obtained through Digium, Inc.at reasonable cost.
+If you wish to use the Zaptel drivers in an application for which the license
+terms are not appropriate (e.g. a proprietary embedded system), licenses under
+more flexible terms can be readily obtained through Digium, Inc. at reasonable
+cost.
 
 
 How do I report bugs or contribute?
 -----------------------------------
 Please report bug and patches to the Asterisk.org bug tracker at
-http://bugs.digium.com in the "zaptel" category.
+http://bugs.digium.com in the "Zaptel" category.
 
 
 Does anything use this library so far?