diff --git a/ChangeLog b/ChangeLog index a5c6170..891d9ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -367,7 +367,7 @@ * Add queuing on contention to per-node lock algorithm, to avoid starvation. - * Only enable cancelation when reading a request, otherwise + * Only enable cancellation when reading a request, otherwise cancellation could happen with a mutex held, which could hang the process on umount @@ -1523,7 +1523,7 @@ 2005-11-21 Miklos Szeredi - * Don't use async cancelation in multithreaded loop. This makes + * Don't use async cancellation in multithreaded loop. This makes it more portable to systems where read() is not async cancel safe. Report from Andriy Gapon @@ -2028,7 +2028,7 @@ * examples: add -lpthread to link flags to work around valgrind quirk - * lib: don't exit threads, so cancelation doesn't cause segfault + * lib: don't exit threads, so cancellation doesn't cause segfault 2005-03-04 Miklos Szeredi @@ -2154,7 +2154,7 @@ 2005-01-10 Miklos Szeredi - * Add missing code that was accidently left out + * Add missing code that was accidentally left out 2005-01-09 Miklos Szeredi @@ -2253,7 +2253,7 @@ 2004-12-10 Miklos Szeredi * When mounting on a subdirectory of / don't duplicate slashes at - the beggining of path (spotted by David Shaw) + the beginning of path (spotted by David Shaw) 2004-12-09 Miklos Szeredi @@ -3081,7 +3081,7 @@ 2002-10-22 Miklos Szeredi - * fix incompatiblity with Red Hat kernels, with help from Nathan + * fix incompatibility with Red Hat kernels, with help from Nathan Thompson-Amato. 2002-04-18 Mark Glines diff --git a/FAQ b/FAQ index 8598f7e..b3ef885 100644 --- a/FAQ +++ b/FAQ @@ -303,7 +303,7 @@ write permissions for the owner? being to atomically obtain a read/write file handle and make the file read-only. Unfortunately, this does not work very well in fuse, since you first get a mknod, and then an open call. At the time of open, -you can't distinguish easily wether this is the first open issued by +you can't distinguish easily whether this is the first open issued by cp, or another process trying to write a read-only file. Defining the 'create' method solves this problem, however this diff --git a/include/fuse_opt.h b/include/fuse_opt.h index 8c08d77..baf1033 100644 --- a/include/fuse_opt.h +++ b/include/fuse_opt.h @@ -161,7 +161,7 @@ struct fuse_args { * * The 'arg' parameter will always contain the whole argument or * option including the parameter if exists. A two-argument option - * ("-x foo") is always converted to single arguemnt option of the + * ("-x foo") is always converted to single argument option of the * form "-xfoo" before this function is called. * * Options of the form '-ofoo' are passed to this function without the @@ -234,7 +234,7 @@ int fuse_opt_add_arg(struct fuse_args *args, const char *arg); * argument vector * * Adds the argument to the N-th position. This is useful for adding - * options at the beggining of the array which must not come after the + * options at the beginning of the array which must not come after the * special '--' option. * * @param args is the structure containing the current argument list