Merge from origin/emacs-30

2ba6387d1d6 ; Fix inaccuracy in ELisp Reference manual
8ac6a178804 ; * etc/PROBLEMS: Mention problems with XPM support in GD...
624322d5f6a Add missing fontification matches for elixir-ts-mode
5bafb11b400 ; Fix copyright year
186ea407326 Don't start docstrings with "This function" or similar
cb8ce2e68bb Enable indent-tabs-mode in obj-c-mode
54f35137096 Fix comment indent in 'lua-ts-mode' and old grammar
8b95549e908 * admin/nt/dist-build/build-dep-zips.py: (deps src) handl...
8064b2a6798 Document undocumented completion commands
c29b798537e ; etc/w32-feature.el (harfbuzz): improve test
0e43e35f96e * admin/nt/dist-build/emacs.nsi: (Uninstall) delete only ...
b83cd8a8fb0 ; * etc/tutorials/TUTORIAL.ko: Fix the beginning.
41caccc488b ; * etc/publicsuffix.txt: Update from upstream.
e6fb18406ee ; Fix refcards
14e791f9ba2 ; Update acknowledgments for Emacs 30
861b7864fc4 ; Fix node name in emacs-lisp-intro.texi
77243ba5be8 ; Update version tags of defcustoms
fe2ac33bae8 ;* doc/misc/efaq.texi (New in Emacs 30): Mention 'trusted...
8fb884f0dc0 ; * etc/NEWS: Fix wording.
e281355a5e8 Improve D-Bus and Tramp manual

# Conflicts:
#	doc/emacs/emacs.texi
#	etc/NEWS
#	lisp/erc/erc-log.el
#	lisp/eshell/esh-mode.el
#	lisp/which-key.el

3 files changed, 4 insertions, 4 deletions

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 098cf6d7d71..dc64b8bebc8 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -571,7 +571,7 @@ If this is set to nil, never try to reconnect."
                  (integer :tag "Seconds")))
 
 (defvar-local erc-server-ping-handler nil
-  "This variable holds the periodic ping timer.")
+  "The periodic server ping timer.")
 
 ;;;; Helper functions
 
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index a1102ebdcdf..69da188ea4f 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -360,13 +360,13 @@ The result is converted to lowercase, as IRC is case-insensitive."
          erc-log-channels-directory)))))
 
 (defun erc-generate-log-file-name-with-date (buffer &rest _ignore)
-  "Compute a short log file name with the current date.
+  "Return a short log file name with the current date.
 The name of the log file is composed of BUFFER and the current date.
 This function is a possible value for `erc-generate-log-file-name-function'."
   (concat (buffer-name buffer) "-" (format-time-string "%Y-%m-%d") ".txt"))
 
 (defun erc-generate-log-file-name-short (buffer &rest _ignore)
-  "Compute a short log file name.
+  "Return a short log file name.
 In fact, it only uses the buffer name of the BUFFER argument, so
 you can affect that using `rename-buffer' and the-like.  This
 function is a possible value for
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index fac0269f9e8..6191ec32182 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -140,7 +140,7 @@ This setting is used by `erc-track-shorten-names'."
                  (const :tag "Max" max)))
 
 (defcustom erc-track-shorten-function 'erc-track-shorten-names
-  "This function will be used to reduce the channel names before display.
+  "Function used to reduce the channel names before display.
 It takes one argument, CHANNEL-NAMES which is a list of strings.
 It should return a list of strings of the same number of elements.
 If nil instead of a function, shortening is disabled."