Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / Documentation / networking / slicecom.txt

diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt
index 59cfd95121fbcb4c8ade890c9a9e739d1d6b2f77..2f04c9267f890217c0b7d95900d4b0bb22db0ab4 100644 (file)
--- a/Documentation/networking/slicecom.txt
+++ b/Documentation/networking/slicecom.txt
@@ -89,7 +89,7 @@ red:  green:  meaning:
 
 -      -       no frame-sync, no signal received, or signal SNAFU.
 -      on      "Everything is OK"
-on     on      Recepion is ok, but the remote end sends Remote Alarm
+on     on      Reception is ok, but the remote end sends Remote Alarm
 on     -       The interface is unconfigured
 
 -----------------------------------------------------------------
@@ -257,12 +257,12 @@ which begin with '//' are the comments.
 // No alarms - Everything OK
 //
 // LOS  - Loss Of Signal - No signal sensed on the input
-// AIS  - Alarm Indication Signal - The remot side sends '11111111'-s, 
+// AIS  - Alarm Indication Signal - The remote side sends '11111111'-s, 
 //     it tells, that there's an error condition, or it's not
 //     initialised.
 // AUXP - Auxiliary Pattern Indication - 01010101.. received.
 // LFA  - Loss of Frame Alignment - no frame sync received.
-// RRA  - Receive Remote Alarm - the remote end's OK, but singnals error cond.
+// RRA  - Receive Remote Alarm - the remote end's OK, but signals error cond.
 // LMFA - Loss of CRC4 Multiframe Alignment - no CRC4 multiframe sync.
 // NMF  - No Multiframe alignment Found after 400 msec - no such alarm using
 //     no-crc4 or crc4 framing, see below.
@@ -364,6 +364,6 @@ Treat them very carefully, these can cause much trouble!
 
        # echo >lbireg 0x1d 0x21
 
-               - Swithing the loop off:
+               - Switching the loop off:
 
        # echo >lbireg 0x1d 0x00