spelling fix

10 files changed, 28 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b9a2ab1..f50db1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-11  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Spelling fixes, thanks to Ioannis Barkas
+
 2005-10-10  Miklos Szeredi <miklos@szeredi.hu>
 
 	* fuse_common.h: use extern "C".  Thanks to Valient Gough for the
diff --git a/include/fuse.h b/include/fuse.h
index d16135e..9739f26 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -127,10 +127,10 @@ struct fuse_operations {
 
     /** File open operation
      *
-     * No creation, or trunctation flags (O_CREAT, O_EXCL, O_TRUNC)
+     * No creation, or truncation flags (O_CREAT, O_EXCL, O_TRUNC)
      * will be passed to open().  Open should check if the operation
      * is permitted for the given flags.  Optionally open may also
-     * return an arbitary filehandle in the fuse_file_info structure,
+     * return an arbitrary filehandle in the fuse_file_info structure,
      * which will be passed to all file operations.
      *
      * Changed in version 2.2
@@ -185,7 +185,7 @@ struct fuse_operations {
      * should be treated equally.  Multiple write-flush sequences are
      * relatively rare, so this shouldn't be a problem.
      *
-     * Filesystems shouldn't assume that flush will allways be called
+     * Filesystems shouldn't assume that flush will always be called
      * after some writes, or that if will be called at all.
      *
      * Changed in version 2.2
@@ -376,11 +376,11 @@ void fuse_destroy(struct fuse *f);
 /**
  * FUSE event loop.
  *
- * Requests from the kernel are processed, and the apropriate
+ * Requests from the kernel are processed, and the appropriate
  * operations are called.
  *
  * @param f the FUSE handle
- * @return 0 if no error occured, -1 otherwise
+ * @return 0 if no error occurred, -1 otherwise
  */
 int fuse_loop(struct fuse *f);
 
@@ -394,7 +394,7 @@ void fuse_exit(struct fuse *f);
 /**
  * FUSE event loop with multiple threads
  *
- * Requests from the kernel are processed, and the apropriate
+ * Requests from the kernel are processed, and the appropriate
  * operations are called.  Request are processed in parallel by
  * distributing them between multiple threads.
  *
@@ -402,7 +402,7 @@ void fuse_exit(struct fuse *f);
  * the application.
  *
  * @param f the FUSE handle
- * @return 0 if no error occured, -1 otherwise
+ * @return 0 if no error occurred, -1 otherwise
  */
 int fuse_loop_mt(struct fuse *f);
 
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 93712f5..dee4325 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -412,7 +412,7 @@ struct fuse_lowlevel_ops {
      * Since file descriptors can be duplicated (dup, dup2, fork), for
      * one open call there may be many flush calls.
      *
-     * Filesystems shouldn't assume that flush will allways be called
+     * Filesystems shouldn't assume that flush will always be called
      * after some writes, or that if will be called at all.
      *
      * fi->fh will contain the value set by the open method, or will
@@ -613,7 +613,7 @@ struct fuse_lowlevel_ops {
      * If size is zero, the total size of the attribute list should be
      * sent with fuse_reply_xattr.
      *
-     * If the size is non-zero, and the null charater separated
+     * If the size is non-zero, and the null character separated
      * attribute list fits in the buffer, the list should be sent with
      * fuse_reply_buf.
      *
@@ -991,7 +991,7 @@ int fuse_session_exited(struct fuse_session *se);
 int fuse_session_loop(struct fuse_session *se);
 
 /**
- * Enter a muli-threaded event loop
+ * Enter a multi-threaded event loop
  *
  * @param se the session
  * @return 0 on success, -1 on error
diff --git a/kernel/dev.c b/kernel/dev.c
index 0f4de86..4df10f4 100644
--- a/kernel/dev.c
+++ b/kernel/dev.c
@@ -191,9 +191,9 @@ void fuse_release_background(struct fuse_req *req)
 /*
  * This function is called when a request is finished.  Either a reply
  * has arrived or it was interrupted (and not yet sent) or some error
- * occured during communication with userspace, or the device file was
- * closed.  It decreases the referece count for the request.  In case
- * of a background request the referece to the stored objects are
+ * occurred during communication with userspace, or the device file was
+ * closed.  It decreases the reference count for the request.  In case
+ * of a background request the reference to the stored objects are
  * released.  The requester thread is woken up (if still waiting), and
  * finally the request is either freed or put on the unused_list
  *
diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index f5afa01..b8270ce 100644
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -429,22 +429,22 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
 		      int isdir);
 
 /**
- * Initialise file operations on a regular file
+ * Initialize file operations on a regular file
  */
 void fuse_init_file_inode(struct inode *inode);
 
 /**
- * Initialise inode operations on regular files and special files
+ * Initialize inode operations on regular files and special files
  */
 void fuse_init_common(struct inode *inode);
 
 /**
- * Initialise inode and file operations on a directory
+ * Initialize inode and file operations on a directory
  */
 void fuse_init_dir(struct inode *inode);
 
 /**
- * Initialise inode operations on a symlink
+ * Initialize inode operations on a symlink
  */
 void fuse_init_symlink(struct inode *inode);
 
@@ -491,7 +491,7 @@ struct fuse_req *fuse_get_request(struct fuse_conn *fc);
 
 /**
  * Decrement reference count of a request.  If count goes to zero put
- * on unused list (preallocated) or free reqest (not preallocated).
+ * on unused list (preallocated) or free request (not preallocated).
  */
 void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req);
 
@@ -511,7 +511,7 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);
 void request_send_background(struct fuse_conn *fc, struct fuse_req *req);
 
 /**
- * Release inodes and file assiciated with background request
+ * Release inodes and file associated with background request
  */
 void fuse_release_background(struct fuse_req *req);
 
diff --git a/lib/fuse.c b/lib/fuse.c
index f2593fe..8555c45 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -28,7 +28,7 @@
 
 /* FUSE flags: */
 
-/** Enable debuging output */
+/** Enable debugging output */
 #define FUSE_DEBUG       (1 << 1)
 
 /** If a file is removed but it's still open, don't hide the file but
diff --git a/lib/fuse_kern_chan.c b/lib/fuse_kern_chan.c
index 7f7d09d..d2999c5 100644
--- a/lib/fuse_kern_chan.c
+++ b/lib/fuse_kern_chan.c
@@ -28,7 +28,7 @@ static int fuse_kern_chan_receive(struct fuse_chan *ch, char *buf, size_t size)
            operation was interrupted */
         if (err == EINTR || err == ENOENT)
             return 0;
-        /* ENODEV means we got unmounted, so we silenty return failure */
+        /* ENODEV means we got unmounted, so we silently return failure */
         if (err != ENODEV)
             perror("fuse: reading device");
         return -1;
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 21d602d..95882ed 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -873,7 +873,7 @@ struct fuse_session *fuse_lowlevel_new(const char *opts,
     };
 
     if (sizeof(struct fuse_lowlevel_ops) < op_size) {
-        fprintf(stderr, "fuse: warning: library too old, some operations may not not work\n");
+        fprintf(stderr, "fuse: warning: library too old, some operations may not work\n");
         op_size = sizeof(struct fuse_lowlevel_ops);
     }
 
@@ -901,4 +901,3 @@ struct fuse_session *fuse_lowlevel_new(const char *opts,
  out:
     return NULL;
 }
-
diff --git a/lib/helper.c b/lib/helper.c
index 75959e2..b078c25 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -28,7 +28,7 @@ static void usage(const char *progname)
             "FUSE options:\n"
             "    -d                     enable debug output (implies -f)\n"
             "    -f                     foreground operation\n"
-            "    -s                     disable multithreaded operation\n"
+            "    -s                     disable multi-threaded operation\n"
             "    -r                     mount read only (equivalent to '-o ro')\n"
             "    -o opt,[opt...]        mount options\n"
             "    -h                     print help\n"
diff --git a/util/fusermount.c b/util/fusermount.c
index cd98ab5..742a25f 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -238,7 +238,7 @@ static int count_fuse_fs(void)
     const char *mtab = _PATH_MOUNTED;
     FILE *fp = setmntent(mtab, "r");
     if (fp == NULL) {
-        fprintf(stderr, "%s: faild to open %s: %s\n", progname, mtab,
+        fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab,
                 strerror(errno));
         return -1;
     }