aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Miklos Szeredi <miklos@szeredi.hu>2007-02-03 11:28:17 +0000
committerGravatar Miklos Szeredi <miklos@szeredi.hu>2007-02-03 11:28:17 +0000
commit47910d7b8af40ffaccc8845d10d109871b5be604 (patch)
treec44982666a67e1d892bb5a3d69cf9643b65f44c8 /doc
parent6e7d018049193efe9d092bb91c4416a332f28278 (diff)
merge to fuse_2_6_merge2
Diffstat (limited to 'doc')
-rw-r--r--doc/kernel.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/kernel.txt b/doc/kernel.txt
index e94e98b..397a41a 100644
--- a/doc/kernel.txt
+++ b/doc/kernel.txt
@@ -94,8 +94,8 @@ Mount options
filesystem is free to implement it's access policy or leave it to
the underlying file access mechanism (e.g. in case of network
filesystems). This option enables permission checking, restricting
- access based on file mode. This is option is usually useful
- together with the 'allow_other' mount option.
+ access based on file mode. It is usually useful together with the
+ 'allow_other' mount option.
'allow_other'
@@ -132,7 +132,7 @@ For each connection the following files exist within this directory:
'waiting'
- The number of requests which are waiting to be transfered to
+ The number of requests which are waiting to be transferred to
userspace or being processed by the filesystem daemon. If there is
no filesystem activity and 'waiting' is non-zero, then the
filesystem is hung or deadlocked.
@@ -157,7 +157,7 @@ following will happen:
2) If the request is not yet sent to userspace AND the signal is not
fatal, then an 'interrupted' flag is set for the request. When
- the request has been successfully transfered to userspace and
+ the request has been successfully transferred to userspace and
this flag is set, an INTERRUPT request is queued.
3) If the request is already sent to userspace, then an INTERRUPT