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

[sfrench/cifs-2.6.git] / Documentation / filesystems / vfs.txt

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 5f71a252e2e0f52b17c4fb6076baa57ae34e1ec4..8dc8e9c2913f50398660780cabb96ddfe5826042 100644 (file)
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -1131,7 +1131,7 @@ struct dentry_operations {
 
   d_manage: called to allow the filesystem to manage the transition from a
        dentry (optional).  This allows autofs, for example, to hold up clients
-       waiting to explore behind a 'mountpoint' whilst letting the daemon go
+       waiting to explore behind a 'mountpoint' while letting the daemon go
        past and construct the subtree there.  0 should be returned to let the
        calling process continue.  -EISDIR can be returned to tell pathwalk to
        use this directory as an ordinary directory and to ignore anything