Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivi...

[linux.git] / Documentation / networking / can.txt

diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index 0cbe6ec22d6ff1d6a3c739f05ae61f4dc24781ec..4f7ae5261364ac4a2c09b0063e900e5c05a0fda3 100644 (file)
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -706,7 +706,7 @@ solution for a couple of reasons:
 
     RX_NO_AUTOTIMER:    Prevent automatically starting the timeout monitor.
 
-    RX_ANNOUNCE_RESUME: If passed at RX_SETUP and a receive timeout occured, a
+    RX_ANNOUNCE_RESUME: If passed at RX_SETUP and a receive timeout occurred, a
       RX_CHANGED message will be generated when the (cyclic) receive restarts.
 
     TX_RESET_MULTI_IDX: Reset the index for the multiple frame transmission.
@@ -1017,7 +1017,7 @@ solution for a couple of reasons:
        in case of a bus-off condition after the specified delay time
        in milliseconds. By default it's off.
 
-    "bitrate 125000 sample_point 0.875"
+    "bitrate 125000 sample-point 0.875"
        Shows the real bit-rate in bits/sec and the sample-point in the
        range 0.000..0.999. If the calculation of bit-timing parameters
        is enabled in the kernel (CONFIG_CAN_CALC_BITTIMING=y), the