commit 972e4f4a7f4fe6e2fafbdc5fe68640a166bce2bb (HEAD, refs/remotes/origin/master)
Author: Robert Pluim <rpluim@gmail.com>
Date:   Mon Aug 4 17:40:04 2025 +0200

    Prefer tls to ssl in nnimap and smtpmail code
    
    * lisp/gnus/nnimap.el (nnimap-open-connection): Use 'tls.
    (nnimap-open-connection-1): Check 'tls before 'ssl.
    * lisp/mail/smtpmail.el (smtpmail-stream-type): Add 'ssl to
    allowed values, state 'tls is preferred.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 566c3e3fba4..2eb6751a211 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -448,13 +448,14 @@ during splitting, which may be slow."
 
 (defun nnimap-open-connection (buffer)
   ;; Be backwards-compatible -- the earlier value of nnimap-stream was
-  ;; `ssl' when nnimap-server-port was nil.  Sort of.
+  ;; `ssl' when nnimap-server-port was nil.  Sort of.  But it's `tls'
+  ;; now, because we're post the Great 2025 Spelling Reform.
   (when (and nnimap-server-port
 	     (eq nnimap-stream 'undecided))
-    (setq nnimap-stream 'ssl))
+    (setq nnimap-stream 'tls))
   (let ((stream
 	 (if (eq nnimap-stream 'undecided)
-	     (cl-loop for type in '(ssl network)
+	     (cl-loop for type in '(tls network)
 		   for stream = (let ((nnimap-stream type))
 				  (nnimap-open-connection-1 buffer))
 		   while (eq stream 'no-connect)
@@ -493,7 +494,7 @@ during splitting, which may be slow."
 	      (nnheader-message 7 "Opening connection to %s via shell..."
 				nnimap-address)
 	      '("imap"))
-	     ((memq nnimap-stream '(ssl tls))
+	     ((memq nnimap-stream '(tls ssl))
 	      (nnheader-message 7 "Opening connection to %s via tls..."
 				nnimap-address)
 	      '("imaps" "imap" "993" "143"))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 2461ddcfd0d..2acb48438ec 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -99,12 +99,15 @@ don't define this value."
   "Type of SMTP connections to use.
 This may be either nil (upgrade with STARTTLS if possible),
 `starttls' (refuse to send if STARTTLS isn't available),
-`plain' (never use STARTTLS), or `ssl' (to use TLS/SSL)."
+`plain' (never use STARTTLS), or `tls' (to use TLS/SSL).
+`ssl' is accepted as a backwards-compatible equivalent
+to `tls'"
   :version "24.1"
   :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)
 		 (const :tag "Always use STARTTLS" starttls)
 		 (const :tag "Never use STARTTLS" plain)
-		 (const :tag "Use TLS/SSL" ssl)))
+		 (const :tag "Use TLS/SSL" tls)
+		 (const :tag "Use TLS/SSL (old name)" ssl)))
 
 (defcustom smtpmail-sendto-domain nil
   "Local domain name without a host name.

commit 62e0cde96712abb3d830d1cd9384925c8c6d3755
Author: Arash Esbati <arash@gnu.org>
Date:   Thu Aug 28 11:50:26 2025 +0200

    ; Delete unnecessary backslashes
    
    * doc/misc/reftex.texi (Options - Creating Citations): Delete
    unnecessary backslashes.

diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 40ffbac737d..33e1cee8d3c 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -4507,7 +4507,7 @@ The keymap which is active in the labels selection process
 
 @defopt reftex-bibfile-ignore-regexps
 List of regular expressions to exclude files in
-@code{\\bibliography@{..@}}.  File names matched by any of these regexps
+@code{\bibliography@{..@}}.  File names matched by any of these regexps
 will not be parsed.  Intended for files which contain only
 @code{@@string} macro definitions and the like, which are ignored by
 @RefTeX{} anyway.
@@ -4605,7 +4605,7 @@ return the string to insert into the buffer.
 @defopt reftex-cite-prompt-optional-args
 Non-@code{nil} means, prompt for empty optional arguments in cite macros.
 When an entry in @code{reftex-cite-format} is given with square brackets to
-indicate optional arguments (for example @samp{\\cite[][]@{%l@}}), RefTeX can
+indicate optional arguments (for example @samp{\cite[][]@{%l@}}), RefTeX can
 prompt for values.  Possible values are:
 @example
 nil     @r{Never prompt for optional arguments}
@@ -4658,7 +4658,7 @@ The keymap which is active in the citation-key selection process
 @end deffn
 
 @defopt reftex-cite-key-separator
-String used to separate several keys in a single @samp{\\cite} macro.
+String used to separate several keys in a single @samp{\cite} macro.
 Per default this is @samp{","} but if you often have to deal with a lot
 of entries and need to break the macro across several lines you might
 want to change it to @samp{", "}.