docs: misc

Co-authored-by: Dustin S. <dstackmasta27@gmail.com>
Co-authored-by: Ferenc Fejes <fejes@inf.elte.hu>
Co-authored-by: Maria José Solano <majosolano99@gmail.com>
Co-authored-by: Yochem van Rosmalen <git@yochem.nl>
Co-authored-by: brianhuster <phambinhanctb2004@gmail.com>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

10 files changed, 23 insertions, 14 deletions

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 07bd7dd192..92f5a261ee 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -422,7 +422,7 @@ after adding them, the returned |extmark| id can be used. >lua
 See also |vim.hl.range()|.
 
 ==============================================================================
-Floating windows                                                 *api-floatwin*
+Floating windows				*api-floatwin* *floating-windows*
 
 Floating windows ("floats") are displayed on top of normal windows.  This is
 useful to implement simple widgets, such as tooltips displayed next to the
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 6fc5b27580..ecb4de09bb 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -22,7 +22,7 @@ Third-party GUIs                                *third-party-guis* *vscode*
 
 Nvim provides a builtin "terminal UI" (|TUI|), but also works with many
 (third-party) GUIs which may provide a fresh look or extra features on top of
-Nvim. For example, "vscode-neovim" essentally allows you to use VSCode as
+Nvim. For example, "vscode-neovim" essentially allows you to use VSCode as
 a Nvim GUI.
 
 - vscode-neovim (Nvim in VSCode!) https://github.com/vscode-neovim/vscode-neovim
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 351f9a56ac..25ef7f24cc 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -882,8 +882,9 @@ foldexpr({lnum})                                          *vim.lsp.foldexpr()*
           callback = function(args)
             local client = vim.lsp.get_client_by_id(args.data.client_id)
             if client:supports_method('textDocument/foldingRange') then
-              vim.wo.foldmethod = 'expr'
-              vim.wo.foldexpr = 'v:lua.vim.lsp.foldexpr()'
+              local win = vim.api.nvim_get_current_win()
+              vim.wo[win][0].foldmethod = 'expr'
+              vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()'
             end
           end,
         })
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index c0254c3fa1..d8d5e42397 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -290,7 +290,7 @@ argument.
 							*-n*
 -n		Disables |swap-file| by setting 'updatecount' to 0 (after
 		executing any |vimrc|).  Recovery after a crash will be
-		impossible.  Improves peformance when working with a file on
+		impossible.  Improves performance when working with a file on
 		a very slow medium (usb drive, network share).
 
 		Enable it again by setting 'updatecount' to some value, e.g.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index df974d750c..257a6a24e7 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -497,7 +497,7 @@ convention, nodes to be concealed are captured as `@conceal`, but any capture
 can be used. For example, the following query can be used to hide code block
 delimiters in Markdown: >query
 
-    (fenced_code_block_delimiter @conceal (#set! conceal ""))
+    ((fenced_code_block_delimiter) @conceal (#set! conceal ""))
 <
 It is also possible to replace a node with a single character, which (unlike
 legacy syntax) can be given a custom highlight. For example, the following
@@ -508,6 +508,13 @@ still highlighted the same as other operators: >query
 <
 Conceals specified in this way respect 'conceallevel'.
 
+Note that although you can use any string for `conceal`, only the first
+character will be used: >query
+
+    ; identifiers will be concealed with 'f'.
+    ((identifier) @conceal (#set! conceal "foo"))
+<
+
                                                *treesitter-highlight-priority*
 Treesitter uses |nvim_buf_set_extmark()| to set highlights with a default
 priority of 100. This enables plugins to set a highlighting priority lower or
@@ -1666,8 +1673,8 @@ LanguageTree:parse({range}, {on_parse})                 *LanguageTree:parse()*
                     Function invoked when parsing completes. When provided and
                     `vim.g._ts_force_sync_parsing` is not set, parsing will
                     run asynchronously. The first argument to the function is
-                    a string respresenting the error type, in case of a
-                    failure (currently only possible for timeouts). The second
+                    a string representing the error type, in case of a failure
+                    (currently only possible for timeouts). The second
                     argument is the list of trees returned by the parse (upon
                     success), or `nil` if the parse timed out (determined by
                     'redrawtime').
diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index 28f1542f64..69204e3fe6 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -652,7 +652,7 @@ do
 
       -- This autocommand updates the value of 'background' anytime we receive
       -- an OSC 11 response from the terminal emulator. If the user has set
-      -- 'background' explictly then we will delete this autocommand,
+      -- 'background' explicitly then we will delete this autocommand,
       -- effectively disabling automatic background setting.
       local force = false
       local id = vim.api.nvim_create_autocmd('TermResponse', {
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 91c0406dc0..fc0b45ecd8 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -34,7 +34,7 @@ local matchregex = vim.filetype._matchregex
 -- can be detected from the first five lines of the file.
 --- @type vim.filetype.mapfn
 function M.asm(path, bufnr)
-  -- tiasm uses `* commment`
+  -- tiasm uses `* comment`
   local lines = table.concat(getlines(bufnr, 1, 10), '\n')
   if findany(lines, { '^%*', '\n%*', 'Texas Instruments Incorporated' }) then
     return 'tiasm'
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 5226c8ae37..a45f9adeb6 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1395,8 +1395,9 @@ end
 ---   callback = function(args)
 ---     local client = vim.lsp.get_client_by_id(args.data.client_id)
 ---     if client:supports_method('textDocument/foldingRange') then
----       vim.wo.foldmethod = 'expr'
----       vim.wo.foldexpr = 'v:lua.vim.lsp.foldexpr()'
+---       local win = vim.api.nvim_get_current_win()
+---       vim.wo[win][0].foldmethod = 'expr'
+---       vim.wo[win][0].foldexpr = 'v:lua.vim.lsp.foldexpr()'
 ---     end
 ---   end,
 --- })
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 638a0d0f3f..48aa809ebd 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -423,7 +423,7 @@ end
 ---
 ---@see vim.lsp.protocol.CompletionTriggerKind
 function M.completion(context)
-  vim.depends('vim.lsp.buf.completion', 'vim.lsp.commpletion.trigger', '0.12')
+  vim.depends('vim.lsp.buf.completion', 'vim.lsp.completion.trigger', '0.12')
   return lsp.buf_request(
     0,
     ms.textDocument_completion,
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 8ea1c44cdc..1f7872715f 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -523,7 +523,7 @@ end
 ---     only the root tree without injections).
 --- @param on_parse fun(err?: string, trees?: table<integer, TSTree>)? Function invoked when parsing completes.
 ---     When provided and `vim.g._ts_force_sync_parsing` is not set, parsing will run
----     asynchronously. The first argument to the function is a string respresenting the error type,
+---     asynchronously. The first argument to the function is a string representing the error type,
 ---     in case of a failure (currently only possible for timeouts). The second argument is the list
 ---     of trees returned by the parse (upon success), or `nil` if the parse timed out (determined
 ---     by 'redrawtime').