4 files changed, 7 insertions, 5 deletions

diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 65389ede99..4101ba50fb 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -7902,6 +7902,7 @@ M.funcs = {
     name = 'printf',
     params = { { 'fmt', 'any' }, { 'expr1', 'any' } },
     signature = 'printf({fmt}, {expr1} ...)',
+    returns = 'string',
   },
   prompt_getprompt = {
     args = 1,
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index 2a3aec1bc7..39bd63462c 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -2365,7 +2365,7 @@ void ex_function(exarg_T *eap)
   // Read the body of the function, until ":endfunction" is found.
   if (KeyTyped) {
     // Check if the function already exists, don't let the user type the
-    // whole function before telling him it doesn't work!  For a script we
+    // whole function before telling them it doesn't work!  For a script we
     // need to skip the body to be able to find what follows.
     if (!eap->skip && !eap->forceit) {
       if (fudi.fd_dict != NULL && fudi.fd_newkey == NULL) {
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index d4aceed013..40a5e3ba78 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1324,7 +1324,7 @@ return {
       defaults = { if_true = '' },
       desc = [=[
         A template for a comment.  The "%s" in the value is replaced with the
-        comment text.  For example, C uses "/*%s*/". Currently only used to
+        comment text. For example, C uses "/*%s*/". Used for |commenting| and to
         add markers for folding, see |fold-marker|.
       ]=],
       full_name = 'commentstring',
diff --git a/src/nvim/vvars.lua b/src/nvim/vvars.lua
index 37cb70c725..224edfaf6e 100644
--- a/src/nvim/vvars.lua
+++ b/src/nvim/vvars.lua
@@ -64,9 +64,10 @@ M.vars = {
   },
   completed_item = {
     desc = [=[
-      Dictionary containing the most recent |complete-items| after
-      |CompleteDone|.  Empty if the completion failed, or after
-      leaving and re-entering insert mode.
+      Dictionary containing the |complete-items| for the most
+      recently completed word after |CompleteDone|.  Empty if the
+      completion failed, or after leaving and re-entering insert
+      mode.
       Note: Plugins can modify the value to emulate the builtin
       |CompleteDone| event behavior.
     ]=],