Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[sfrench/cifs-2.6.git] / Documentation / scsi / st.txt

diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt
index 20e30cf31877ff71251a925162c08959c29a063e..b7be95b5bd24f1a53431ef0d45ddb85b2832c3a9 100644 (file)
--- a/Documentation/scsi/st.txt
+++ b/Documentation/scsi/st.txt
@@ -1,5 +1,5 @@
 This file contains brief information about the SCSI tape driver.
-The driver is currently maintained by Kai Mäkisara (email
+The driver is currently maintained by Kai Mäkisara (email
 Kai.Makisara@kolumbus.fi)
 
 Last modified: Mon Mar  7 21:14:44 2005 by kai.makisara
@@ -249,7 +249,7 @@ BOOT TIME CONFIGURATION
 
 If the driver is compiled into the kernel, the same parameters can be
 also set using, e.g., the LILO command line. The preferred syntax is
-is to use the same keyword used when loading as module but prepended
+to use the same keyword used when loading as module but prepended
 with 'st.'. For instance, to set the maximum number of scatter/gather
 segments, the parameter 'st.max_sg_segs=xx' should be used (xx is the
 number of scatter/gather segments).
@@ -261,7 +261,7 @@ pairs are separated with a comma (no spaces allowed). A colon can be
 used instead of the equal mark. The definition is prepended by the
 string st=. Here is an example:
 
-       st=buffer_kbs:64,write_threhold_kbs:60
+       st=buffer_kbs:64,write_threshold_kbs:60
 
 The following syntax used by the old kernel versions is also supported:
 
@@ -369,7 +369,7 @@ MTSETDRVBUFFER
                the device dependent address. It is recommended to set
                this flag unless there are tapes using the device
                dependent (from the old times) (global)
-            MT_ST_SYSV sets the SYSV sematics (mode)
+            MT_ST_SYSV sets the SYSV semantics (mode)
             MT_ST_NOWAIT enables immediate mode (i.e., don't wait for
                the command to finish) for some commands (e.g., rewind)
             MT_ST_DEBUGGING debugging (global; debugging must be