Merge with Linux 2.4.2.

5 files changed, 7 insertions, 6 deletions

diff --git a/Documentation/isdn/INTERFACE b/Documentation/isdn/INTERFACE
index c2a5494b1..a82ffcc1c 100644
--- a/Documentation/isdn/INTERFACE
+++ b/Documentation/isdn/INTERFACE
@@ -480,7 +480,7 @@ Description of the Interface between Linklevel and Hardwarelevel
     Parameter:
       driver      = driver-Id
       command     = ISDN_CMD_PROT_IO
-      arg         = The lower 8 Bits define the adressed protocol as defined
+      arg         = The lower 8 Bits define the addressed protocol as defined
                     in ISDN_PTYPE..., the upper bits are used to differenciate
                     the protocol specific CMD.  
       
@@ -734,7 +734,7 @@ Description of the Interface between Linklevel and Hardwarelevel
     Parameter:
       driver      = driver-Id
       command     = ISDN_STAT_PROT
-      arg         = The lower 8 Bits define the adressed protocol as defined
+      arg         = The lower 8 Bits define the addressed protocol as defined
                     in ISDN_PTYPE..., the upper bits are used to differenciate
                     the protocol specific STAT.  
       
@@ -748,7 +748,7 @@ Description of the Interface between Linklevel and Hardwarelevel
     loading the driver. The LL has to ignore a disabled channel when searching
     for free channels. The HL driver itself never delivers STAT callbacks for
     disabled channels. 	    
-    The LL returns a nonzero code if the operation was not successfull or the
+    The LL returns a nonzero code if the operation was not successful or the
     selected channel is actually regarded as busy.
 
     Parameter:
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index 63308c20a..57fd7906f 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -442,6 +442,7 @@ Special thanks to:
 	Enrik Berkhan (enrik@starfleet.inka.de) for S0BOX specific stuff
 	Ton van Rosmalen for Teles PCI
 	Petr Novak <petr.novak@i.cz> for Winbond W6692 support
+	Werner Cornelius <werner@isdn4linux.de> for HFC-PCI, HFC-S(+/P) and supplementary services support
         and more people who are hunting bugs. (If I forgot somebody, please
 	send me a mail).
 
diff --git a/Documentation/isdn/README.diversion b/Documentation/isdn/README.diversion
index 98909b1bf..bddcd5fb8 100644
--- a/Documentation/isdn/README.diversion
+++ b/Documentation/isdn/README.diversion
@@ -6,7 +6,7 @@ document. The diversion services may be used with all cards supported by
 the HiSax driver.
 The diversion kernel interface and controlling tool divertctrl were written
 by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) under the
-GNU Public License.
+GNU General Public License.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Documentation/isdn/README.hfc-pci b/Documentation/isdn/README.hfc-pci
index 6cc311e35..e8a4ef022 100644
--- a/Documentation/isdn/README.hfc-pci
+++ b/Documentation/isdn/README.hfc-pci
@@ -35,7 +35,7 @@ If the io parameter is used the io addresses of all used cards should be
 supplied else the parameter is assumed 0 and a auto search for a free card is
 invoked which may not give the wanted result. 
 
-Comments and reports to werner@isdn4linux.de or werner@titro.de .
+Comments and reports to werner@isdn4linux.de or werner@isdn-development.de
 
 
 
diff --git a/Documentation/isdn/README.hysdn b/Documentation/isdn/README.hysdn
index 90a5e8b71..f8ce775d6 100644
--- a/Documentation/isdn/README.hysdn
+++ b/Documentation/isdn/README.hysdn
@@ -2,7 +2,7 @@ $Id: README.hysdn,v 1.3 2000/08/06 09:22:51 armin Exp $
 The hysdn driver has been written by
 by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) 
 for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver
-under the GNU Public License.
+under the GNU General Public License.
 
 The CAPI 2.0-support was added by Ulrich Albrecht (ualbrecht@hypercope.de)
 for Hypercope GmbH Aachen, Germany.