Merge from origin/emacs-30

aad5b676d1c ; * lisp/emacs-lisp/ring.el (ring-convert-sequence-to-rin...
ddd63891a48 ; * doc/misc/flymake.texi (Troubleshooting): Fix typo (bu...
8dcb8020466 ; vc-hooks.el: Standardize terminology in header.

3 files changed, 6 insertions, 7 deletions

diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 42935703c11..2cdeac98d76 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -231,7 +231,7 @@ can use the variables @code{flymake-mode-line-format} and
 @cindex disabled backends
 @cindex backends, disabled
 As Flymake supports multiple simultaneously active external backends,
-is becomes useful to monitor their status.  For example, some backends
+it becomes useful to monitor their status.  For example, some backends
 may take longer than others to respond or complete, and some may
 decide to @emph{disable} themselves if they are not suitable for the
 current buffer or encounter some unavoidable problem.  A disabled
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index 293f0f93a0c..8518753ab20 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -240,7 +240,7 @@ If the RING is full, behavior depends on GROW-P:
   (ring-insert+extend ring item grow-p))
 
 (defun ring-convert-sequence-to-ring (seq)
-  "Convert sequence SEQ to a ring.  Return the ring.
+  "Convert sequence SEQ to a ring, and return the ring.
 If SEQ is already a ring, return it."
   (if (ring-p seq)
       seq
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index c71b2b014c5..ded24ada8a0 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1,4 +1,4 @@
-;;; vc-hooks.el --- resident support for version-control  -*- lexical-binding:t -*-
+;;; vc-hooks.el --- Preloaded support for version control  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1992-1996, 1998-2025 Free Software Foundation, Inc.
 
@@ -23,10 +23,9 @@
 
 ;;; Commentary:
 
-;; This is the always-loaded portion of VC.  It takes care of
-;; VC-related activities that are done when you visit a file, so that
-;; vc.el itself is loaded only when you use a VC command.  See the
-;; commentary of vc.el.
+;; This is the preloaded portion of VC.  It takes care of VC-related
+;; activities that are done when you visit a file, so that vc.el itself
+;; is loaded only when you use a VC command.  See commentary of vc.el.
 
 ;;; Code: