7 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 6d20028c05..b87d561fa6 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -63,7 +63,7 @@ int64_t os_get_pid()
 #endif
 }
 
-/// Get the hostname of the machine runing Neovim.
+/// Get the hostname of the machine running Neovim.
 ///
 /// @param hostname Buffer to store the hostname.
 /// @param len Length of `hostname`.
diff --git a/src/nvim/os/event.c b/src/nvim/os/event.c
index cdf40541d5..2ebf28f436 100644
--- a/src/nvim/os/event.c
+++ b/src/nvim/os/event.c
@@ -74,7 +74,7 @@ bool event_poll(int32_t ms)
     // Timeout passed as argument to the timer
     timer.data = &timed_out;
     // We only start the timer after the loop is running, for that we
-    // use an prepare handle(pass the interval as data to it)
+    // use a prepare handle(pass the interval as data to it)
     timer_prepare.data = &ms;
     uv_prepare_start(&timer_prepare, timer_prepare_cb);
   } else if (ms == 0) {
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index bdf20f22eb..48bc75cb8e 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -148,7 +148,7 @@ static bool is_executable_in_path(const char_u *name)
 
 /// Get stat information for a file.
 ///
-/// @return OK on success, FAIL if an failure occured.
+/// @return OK on success, FAIL if a failure occurred.
 int os_stat(const char_u *name, uv_stat_t *statbuf)
 {
   uv_fs_t request;
@@ -299,7 +299,7 @@ int os_remove(const char *path)
 ///
 /// @param file_descriptor File descriptor of the file.
 /// @param[out] file_info Pointer to a FileInfo to put the information in.
-/// @return `true` on sucess, `false` for failure.
+/// @return `true` on success, `false` for failure.
 bool os_get_file_info(const char *path, FileInfo *file_info)
 {
   if (os_stat((char_u *)path, &(file_info->stat)) == OK) {
@@ -312,7 +312,7 @@ bool os_get_file_info(const char *path, FileInfo *file_info)
 ///
 /// @param path Path to the file.
 /// @param[out] file_info Pointer to a FileInfo to put the information in.
-/// @return `true` on sucess, `false` for failure.
+/// @return `true` on success, `false` for failure.
 bool os_get_file_info_link(const char *path, FileInfo *file_info)
 {
   uv_fs_t request;
@@ -329,7 +329,7 @@ bool os_get_file_info_link(const char *path, FileInfo *file_info)
 ///
 /// @param file_descriptor File descriptor of the file.
 /// @param[out] file_info Pointer to a FileInfo to put the information in.
-/// @return `true` on sucess, `false` for failure.
+/// @return `true` on success, `false` for failure.
 bool os_get_file_info_fd(int file_descriptor, FileInfo *file_info)
 {
   uv_fs_t request;
diff --git a/src/nvim/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h
index 4d8d51699b..c8f243e2cf 100644
--- a/src/nvim/os/msgpack_rpc.h
+++ b/src/nvim/os/msgpack_rpc.h
@@ -53,7 +53,7 @@ void msgpack_rpc_error(char *msg, msgpack_packer *res)
 ///
 /// @param obj The object to convert
 /// @param[out] arg A pointer to the avalue
-/// @return true if the convertion succeeded, false otherwise
+/// @return true if the conversion succeeded, false otherwise
 bool msgpack_rpc_to_boolean(msgpack_object *obj, Boolean *arg)
   FUNC_ATTR_NONNULL_ALL;
 bool msgpack_rpc_to_integer(msgpack_object *obj, Integer *arg)
diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c
index 9b2cea52a5..1025201f7a 100644
--- a/src/nvim/os/rstream.c
+++ b/src/nvim/os/rstream.c
@@ -110,7 +110,7 @@ void rstream_set_file(RStream *rstream, uv_file file)
   }
 
   if (rstream->file_type == UV_FILE) {
-    // Non-blocking file reads are simulated with a idle handle that reads
+    // Non-blocking file reads are simulated with an idle handle that reads
     // in chunks of rstream->buffer_size, giving time for other events to
     // be processed between reads.
     rstream->fread_idle = xmalloc(sizeof(uv_idle_t));
diff --git a/src/nvim/os/server.c b/src/nvim/os/server.c
index b5d8d8af64..4bbe81ad01 100644
--- a/src/nvim/os/server.c
+++ b/src/nvim/os/server.c
@@ -115,7 +115,7 @@ void server_start(char *endpoint)
   uint32_t addr_len = ip_end - addr;
 
   if (addr_len > sizeof(ip) - 1) {
-    // Maximum length of a ip address buffer is 15(eg: 255.255.255.255)
+    // Maximum length of an IP address buffer is 15(eg: 255.255.255.255)
     addr_len = sizeof(ip);
   }
 
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 766b055450..ed842ba8b2 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -393,7 +393,7 @@ static void alloc_cb(uv_handle_t *handle, size_t suggested, uv_buf_t *buf)
 static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
 {
   // TODO(tarruda): avoid using a growable array for this, refactor the
-  // algorithm to call `ml_append` directly(skip unecessary copies/resizes)
+  // algorithm to call `ml_append` directly(skip unnecessary copies/resizes)
   int i;
   ProcessData *pdata = (ProcessData *)stream->data;