diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/networking/slicecom.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/networking/slicecom.txt')
| -rw-r--r-- | Documentation/networking/slicecom.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/slicecom.txt b/Documentation/networking/slicecom.txt index 59cfd95121f..2f04c9267f8 100644 --- 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 |