diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index d0cbfefb47..c6ca5e5ce9 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -51,7 +51,7 @@ LSP
 • vim.lsp.buf_request_all		The `error` key has been renamed to `err` inside
 					the result parameter of the handler.
 • *vim.lsp.with()*			Pass configuration to equivalent
-					functions in `vim.lsp.buf.*'.
+					functions in `vim.lsp.buf.*`.
 • |vim.lsp.handlers|
 	No longer support client to server response handlers. Only server to
 	client requests/notification handlers are supported.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ed342d9229..0f2e6f0a08 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -227,7 +227,7 @@ LUA
 
 • |vim.fs.rm()| can delete files and directories.
 • |vim.validate()| now has a new signature which uses less tables,
-  is more peformant and easier to read.
+  is more performant and easier to read.
 • |vim.str_byteindex()| and |vim.str_utfindex()| gained overload signatures
   supporting two new parameters, `encoding` and `strict_indexing`.
 
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 09d1369d46..04dd854637 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.2.  Last change: 2020 Aug 15
+*pi_netrw.txt*  Nvim
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index c8570044e5..96b26d92e7 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 8.2.  Last change: 2020 Jan 07
+*pi_tar.txt*	Nvim
 
 		       +====================+
 		       | Tar File Interface |
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 50075c3bde..76c6b729db 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -414,7 +414,7 @@ TUI:
 - 'term' reflects the terminal type derived from |$TERM| and other environment
   checks.  For debugging only; not reliable during startup. >vim
           :echo &term
--  "builtin_x" means one of the |builtin-terms| was chosen, because the expected
+- "builtin_x" means one of the |builtin-terms| was chosen, because the expected
   terminfo file was not found on the system.
 - Nvim will use 256-colour capability on Linux virtual terminals.  Vim uses
   only 8 colours plus bright foreground on Linux VTs.
diff --git a/runtime/ftplugin/checkhealth.vim b/runtime/ftplugin/checkhealth.vim
index 00f24a2912..cc53d723c2 100644
--- a/runtime/ftplugin/checkhealth.vim
+++ b/runtime/ftplugin/checkhealth.vim
@@ -1,6 +1,5 @@
 " Vim filetype plugin
 " Language:     Nvim :checkhealth buffer
-" Last Change:  2022 Nov 10
 
 if exists("b:did_ftplugin")
   finish
diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua
index 32d615c65c..711ee35775 100644
--- a/runtime/ftplugin/query.lua
+++ b/runtime/ftplugin/query.lua
@@ -1,6 +1,5 @@
 -- Neovim filetype plugin file
 -- Language:	Treesitter query
--- Last Change:	2024 Jul 03
 
 if vim.b.did_ftplugin == 1 then
   return
diff --git a/runtime/indent/query.lua b/runtime/indent/query.lua
index c5b4f1f03d..17b8e9d2ac 100644
--- a/runtime/indent/query.lua
+++ b/runtime/indent/query.lua
@@ -1,6 +1,5 @@
 -- Neovim indent file
 -- Language:	Treesitter query
--- Last Change:	2024 Jul 03
 
 -- it's a lisp!
 vim.cmd([[runtime! indent/lisp.vim]])
diff --git a/runtime/syntax/checkhealth.vim b/runtime/syntax/checkhealth.vim
index a4f6e016cb..14c80640ba 100644
--- a/runtime/syntax/checkhealth.vim
+++ b/runtime/syntax/checkhealth.vim
@@ -1,6 +1,5 @@
 " Vim syntax file
 " Language:     Nvim :checkhealth buffer
-" Last Change:  2022 Nov 10
 
 if exists("b:current_syntax")
   finish
diff --git a/runtime/syntax/query.lua b/runtime/syntax/query.lua
index 2dfe29f69b..0de08b4dfb 100644
--- a/runtime/syntax/query.lua
+++ b/runtime/syntax/query.lua
@@ -1,6 +1,5 @@
 -- Neovim syntax file
 -- Language:	Treesitter query
--- Last Change:	2024 Jul 03
 
 -- it's a lisp!
 vim.cmd([[runtime! syntax/lisp.vim]])
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index 8f026e9600..cc1b833c3c 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -303,7 +303,7 @@ static const char *highlight_init_both[] = {
   "default link @tag.builtin Special",
 
   // :help
-  // Higlight "===" and "---" heading delimiters specially.
+  // Highlight "===" and "---" heading delimiters specially.
   "default @markup.heading.1.delimiter.vimdoc guibg=bg guifg=bg guisp=fg gui=underdouble,nocombine ctermbg=NONE ctermfg=NONE cterm=underdouble,nocombine",
   "default @markup.heading.2.delimiter.vimdoc guibg=bg guifg=bg guisp=fg gui=underline,nocombine ctermbg=NONE ctermfg=NONE cterm=underline,nocombine",
 
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 65f718f925..b5a8588edd 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1119,7 +1119,7 @@ int utf_char2bytes(const int c, char *const buf)
 /// stateful algorithm to determine grapheme clusters. Still available
 /// to support some legacy code which hasn't been refactored yet.
 ///
-/// To check if a char would combine with a preceeding space, use
+/// To check if a char would combine with a preceding space, use
 /// utf_iscomposing_first() instead.
 ///
 /// Based on code from Markus Kuhn.
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 1ce737bc59..1cfe4cd08b 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -228,7 +228,7 @@ static void set_init_default_backupskip(void)
 #endif
     {
       p = vim_getenv(names[i]);
-      plen = 0;  // will be calcuated below
+      plen = 0;  // will be calculated below
     }
     if (p != NULL && *p != NUL) {
       bool has_trailing_path_sep = false;
diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
index 7df6a1a5d7..d1951d4f96 100644
--- a/src/nvim/popupmenu.c
+++ b/src/nvim/popupmenu.c
@@ -880,7 +880,7 @@ static void pum_adjust_info_position(win_T *wp, int height, int width)
 /// Used for nvim__complete_set
 ///
 /// @param selected the selected compl item.
-/// @parma info     Info string.
+/// @param info     Info string.
 /// @return a win_T pointer.
 win_T *pum_set_info(int selected, char *info)
 {
diff --git a/src/nvim/tui/termkey/termkey-internal.h b/src/nvim/tui/termkey/termkey-internal.h
index 107591f950..97fae939c5 100644
--- a/src/nvim/tui/termkey/termkey-internal.h
+++ b/src/nvim/tui/termkey/termkey-internal.h
@@ -47,7 +47,7 @@ struct TermKey {
   int canonflags;
   unsigned char *buffer;
   size_t buffstart;  // First offset in buffer
-  size_t buffcount;  // NUMBER of entires valid in buffer
+  size_t buffcount;  // NUMBER of entries valid in buffer
   size_t buffsize;   // Total malloc'ed size
   size_t hightide;   // Position beyond buffstart at which peekkey() should next start
                      // normally 0, but see also termkey_interpret_csi
diff --git a/test/functional/autocmd/completedone_spec.lua b/test/functional/autocmd/completedone_spec.lua
index 33beb16db2..36dc73842d 100644
--- a/test/functional/autocmd/completedone_spec.lua
+++ b/test/functional/autocmd/completedone_spec.lua
@@ -32,7 +32,7 @@ describe('CompleteDone', function()
         feed('<Esc>')
         eq('cancel', eval('g:donereason'))
       end)
-      it('when overriden by another complete()', function()
+      it('when overridden by another complete()', function()
         call('complete', call('col', '.'), { 'bar', 'baz' })
         eq('cancel', eval('g:donereason'))
       end)
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index 7062211187..f3c477d210 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -343,7 +343,7 @@ describe('startup', function()
     local screen = Screen.new(25, 3)
     -- Remote UI connected by --embed.
     -- TODO: a lot of tests in this file already use the new default color scheme.
-    -- once we do the batch update of tests to use it, remove this workarond
+    -- once we do the batch update of tests to use it, remove this workaround
     screen._default_attr_ids = nil
     command([[echo has('ttyin') has('ttyout')]])
     screen:expect([[
diff --git a/test/functional/lua/system_spec.lua b/test/functional/lua/system_spec.lua
index afbada007d..3f847ca3be 100644
--- a/test/functional/lua/system_spec.lua
+++ b/test/functional/lua/system_spec.lua
@@ -114,7 +114,7 @@ describe('vim.system', function()
   end)
 
   if t.is_os('win') then
-    it('can resolve windows command extentions.', function()
+    it('can resolve windows command extensions', function()
       t.write_file('test.bat', 'echo hello world')
       system_sync({ 'chmod', '+x', 'test.bat' })
       system_sync({ './test' })
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index 0f68b7eae2..f14e24bb19 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -3499,7 +3499,7 @@ describe('LSP', function()
         }
         return vim.lsp.util.convert_signature_help_to_markdown_lines(signature_help, 'zig', { '(' })
       end)
-      -- Note that although the higlight positions below are 0-indexed, the 2nd parameter
+      -- Note that although the highlight positions below are 0-indexed, the 2nd parameter
       -- corresponds to the 3rd line because the first line is the ``` from the
       -- Markdown block.
       local expected = { 3, 4, 3, 11 }
diff --git a/test/functional/provider/clipboard_spec.lua b/test/functional/provider/clipboard_spec.lua
index 722442acbd..2b54ea93e0 100644
--- a/test/functional/provider/clipboard_spec.lua
+++ b/test/functional/provider/clipboard_spec.lua
@@ -544,7 +544,7 @@ describe('clipboard (with fake clipboard.vim)', function()
       ]])
       feed('gg^<C-v>') -- Goto start of top line enter visual block mode
       feed('3ljy^k') -- yank 4x2 block & goto initial location
-      feed('P') -- Paste it infront
+      feed('P') -- Paste it before cursor
       expect([[
         aabbaabbcc
         ddeeddeeff