Merge with 2.3.27.

4 files changed, 13 insertions, 14 deletions

diff --git a/Documentation/networking/arcnet-hardware.txt b/Documentation/networking/arcnet-hardware.txt
index 638bb8abf..b84cdc4d6 100644
--- a/Documentation/networking/arcnet-hardware.txt
+++ b/Documentation/networking/arcnet-hardware.txt
@@ -78,7 +78,7 @@ CABLING ARCNET NETWORKS
 -----------------------
 
 This section was rewritten by 
-        Vojtech Pavlik     <Vojtech.Pavlik@st.mff.cuni.cz>
+        Vojtech Pavlik     <vojtech@suse.cz>
 using information from several people, including:
         Avery Pennraun     <apenwarr@worldvisions.ca>
  	Stephen A. Wood    <saw@hallc1.cebaf.gov>
@@ -270,7 +270,7 @@ All ARCnet cards should have a total of four or five different settings:
     that IRQ2 is the same as IRQ9, as far as Linux is concerned.  You can
     "cat /proc/interrupts" for a somewhat complete list of which ones are in
     use at any given time.  Here is a list of common usages from Vojtech
-    Pavlik <Vojtech.Pavlik@st.mff.cuni.cz>:
+    Pavlik <vojtech@suse.cz>:
     	("Not on bus" means there is no way for a card to generate this
 	interrupt)
 	IRQ  0 - Timer 0 (Not on bus)
@@ -347,8 +347,7 @@ All ARCnet cards should have a total of four or five different settings:
     network.
     
 Also, on many cards (not mine, though) there are red and green LED's. 
-Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz> tells me this is what they
-mean:
+Vojtech Pavlik <vojtech@suse.cz> tells me this is what they mean:
 	GREEN           RED             Status
 	-----		---		------
 	OFF             OFF             Power off
@@ -1735,11 +1734,11 @@ JP 6  : IRQ set (ONLY ONE jumper on 1-5 for IRQ 2-6)
 ** Acer **
 8-bit card, Model 5210-003
 --------------------------
-  - from Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz> using portions of
-    the existing arcnet-hardware file.
+  - from Vojtech Pavlik <vojtech@suse.cz> using portions of the existing
+    arcnet-hardware file.
 
-This is a 90C26 based card.  Its configuration seems similar to 
-the SMC PC100, but has some additional jumpers I don't know.
+This is a 90C26 based card.  Its configuration seems similar to the SMC
+PC100, but has some additional jumpers I don't know the meaning of.
 
                __
               |  |
@@ -1903,7 +1902,7 @@ guess the purpose.
 ** Datapoint? **
 LAN-ARC-8, an 8-bit card
 ------------------------
-  - from Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz>
+  - from Vojtech Pavlik <vojtech@suse.cz>
 
 This is another SMC 90C65-based ARCnet card. I couldn't identify the
 manufacturer, but it might be DataPoint, because the card has the
@@ -2043,7 +2042,7 @@ parameters.  These two switches are normally left in the OFF position.
 ** Topware **
 8-bit card, TA-ARC/10
 -------------------------
-  - from Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz>
+  - from Vojtech Pavlik <vojtech@suse.cz>
 
 This is another very similar 90C65 card. Most of the switches and jumpers
 are the same as on other clones.
@@ -2752,7 +2751,7 @@ Setting the Timeouts
 ** No Name **
 8-bit cards ("Made in Taiwan R.O.C.")
 -----------
-  - from Vojtech Pavlik <Vojtech.Pavlik@st.mff.cuni.cz>
+  - from Vojtech Pavlik <vojtech@suse.cz>
 
 I have named this ARCnet card "NONAME", since I got only the card with
 no manual at all and the only text identifying the manufacturer is 
diff --git a/Documentation/networking/baycom.txt b/Documentation/networking/baycom.txt
index 71e0c76df..b9d58fe2f 100644
--- a/Documentation/networking/baycom.txt
+++ b/Documentation/networking/baycom.txt
@@ -93,7 +93,7 @@ Every time a driver is inserted into the kernel, it has to know which
 modems it should access at which ports. This can be done with the setbaycom
 utility. If you are only using one modem, you can also configure the
 driver from the insmod command line (or by means of an option line in
-/etc/conf.modules).
+/etc/modules.conf).
 
 Examples:
   insmod baycom_ser_fdx mode="ser12*" iobase=0x3f8 irq=4
diff --git a/Documentation/networking/ltpc.txt b/Documentation/networking/ltpc.txt
index ed9983f07..b93585b95 100644
--- a/Documentation/networking/ltpc.txt
+++ b/Documentation/networking/ltpc.txt
@@ -25,7 +25,7 @@ the driver will try to determine them itself.
 
 If you load the driver as a module, you can pass the parameters "io=",
 "irq=", and "dma=" on the command line with insmod or modprobe, or add
-them as options in /etc/conf.modules:
+them as options in /etc/modules.conf:
 
  alias lt0 ltpc # autoload the module when the interface is configured
  options ltpc io=0x240 irq=9 dma=1
diff --git a/Documentation/networking/soundmodem.txt b/Documentation/networking/soundmodem.txt
index 202101d18..f6d49e9af 100644
--- a/Documentation/networking/soundmodem.txt
+++ b/Documentation/networking/soundmodem.txt
@@ -39,7 +39,7 @@ Every time the driver is inserted into the kernel, it has to know which
 modems it should access at which ports. This can be done with the setbaycom
 utility. If you are only using one modem, you can also configure the
 driver from the insmod command line (or by means of an option line in
-/etc/conf.modules).
+/etc/modules.conf).
 
 Examples:
   insmod soundmodem mode="sbc:afsk1200" iobase=0x220 irq=5 dma=1